修复搜索崩溃问题

raee · raee · commit 675e83fd6b59 · 2017-11-22T01:32:12.000+08:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -105,6 +105,7 @@ android {
         xiaomi {}       // 小米商店
         huawei {}       // 华为商店
         official {}      // 官方版本
+        fir{} // fir内测平台版本
     }
 
     // 批量渠道包值替换
diff --git a/app/src/main/java/com/rae/cnblogs/AppMobclickAgent.java b/app/src/main/java/com/rae/cnblogs/AppMobclickAgent.java
@@ -6,6 +6,7 @@
 import android.content.pm.PackageManager;
 import android.text.TextUtils;
 
+import com.rae.cnblogs.sdk.UserProvider;
 import com.umeng.analytics.MobclickAgent;
 
 import java.text.SimpleDateFormat;
@@ -26,6 +27,20 @@ public static void onAppOpenEvent(Context context) {
         @SuppressLint("SimpleDateFormat")
         String openDate = new SimpleDateFormat("HH").format(new Date()) + ":00";
         MobclickAgent.onEvent(context, "APP_OPEN_EVENT", openDate);
+
+        // 统计活跃用户
+        onUserOpenEvent(context);
+    }
+
+    /**
+     * 统计用户打开APP事件
+     */
+    public static void onUserOpenEvent(Context context) {
+        try {
+            String blogApp = UserProvider.getInstance().isLogin() ? UserProvider.getInstance().getLoginUserInfo().getBlogApp() : "Guest";
+            MobclickAgent.onEvent(context, "APP_USER_OPEN_EVENT", blogApp);
+        } catch (Throwable ignored) {
+        }
     }
 
     /**
diff --git a/app/src/main/java/com/rae/cnblogs/activity/SettingActivity.java b/app/src/main/java/com/rae/cnblogs/activity/SettingActivity.java
@@ -6,6 +6,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.widget.ProgressBar;
@@ -29,12 +30,14 @@
 import com.rae.cnblogs.sdk.UserProvider;
 import com.rae.cnblogs.sdk.bean.VersionInfo;
 import com.rae.cnblogs.widget.ImageLoadingView;
+import com.tencent.bugly.beta.tinker.TinkerManager;
 import com.umeng.analytics.MobclickAgent;
 
 import org.greenrobot.eventbus.EventBus;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import butterknife.OnLongClick;
 
 
 /**
@@ -231,6 +234,18 @@ public void onFontSettingClick() {
         AppRoute.jumpToFontSetting(this);
     }
 
+    @OnLongClick(R.id.tv_check_update)
+    public boolean onVersionLongClick() {
+        String newTinkerId = TinkerManager.getNewTinkerId();
+        String tinkerId = TinkerManager.getTinkerId();
+        if (!TextUtils.isEmpty(newTinkerId)) {
+            AppUI.toastInCenter(this, "基准版本：" + tinkerId + "；补丁版本：" + newTinkerId);
+        } else {
+            AppUI.toastInCenter(this, "当前版本暂无补丁版本！");
+        }
+        return false;
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -246,4 +261,5 @@ public String getAppVersion() {
         }
         return "";
     }
+
 }
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/SearchFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/SearchFragment.java
@@ -19,7 +19,6 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.rae.cnblogs.AppUI;
 import com.rae.cnblogs.R;
 import com.rae.cnblogs.adapter.BaseItemAdapter;
 import com.rae.cnblogs.adapter.SearchSuggestionAdapter;
@@ -243,23 +242,16 @@ public void onSearchClick() {
      * 执行搜索
      */
     private void preformSearch() {
-        if (true) {
-            AppUI.toastInCenter(getContext(), "我是热更新");
-            return;
-        }
-
         // 弹下键盘
         InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
         if (imm != null) {
             imm.hideSoftInputFromWindow(mSearchView.getWindowToken(), 0);
         }
 
         // 取消/清除搜索建议数据
-
         mSuggestionAdapter.clear();
         mSuggestionAdapter.notifyDataSetChanged();
 
-
         // 显示或者隐藏搜索建议
         mRecyclerView.setVisibility(mSearchView.length() > 0 ? View.GONE : View.VISIBLE);
 
diff --git a/app/src/main/java/com/rae/cnblogs/presenter/impl/SearchPresenterImpl.java b/app/src/main/java/com/rae/cnblogs/presenter/impl/SearchPresenterImpl.java
@@ -37,6 +37,11 @@ public void destroy() {
     @Override
     public void suggest() {
         cancelSuggest();
+        if (mSuggestionSubscriber != null && !mSuggestionSubscriber.isDisposed()) {
+            // 释放之前的
+            mSuggestionSubscriber.dispose();
+            mSuggestionSubscriber = null;
+        }
         createObservable(mSearchApi.getSuggestion(mView.getSearchText()))
                 .doOnSubscribe(new Consumer<Disposable>() {
                     @Override
@@ -51,12 +56,10 @@ public void accept(@NonNull Disposable disposable) throws Exception {
                 .subscribe(new ApiDefaultObserver<List<String>>() {
                     @Override
                     protected void onError(String message) {
-
                     }
 
                     @Override
                     protected void accept(List<String> data) {
-
                         mView.onSuggestionSuccess(data);
                     }
                 });
diff --git a/app/tinker-support.gradle b/app/tinker-support.gradle
@@ -35,10 +35,9 @@ tinkerSupport {
     baseApkResourceMapping = "${bakPath}/${baseApkDir}/${apkName}-R.txt"
 
     // 构建基准包和补丁包都要指定不同的tinkerId，并且必须保证唯一性
-    // 基类版本：cnblogs-basic-1.1.0
+    // 基类版本：cnblogs-basic-1.1.1
     // 补丁版本：cnblogs-patch-1.1.1.01
-//    tinkerId = "cnblogs-basic-1.1.1"
-    tinkerId = "cnblogs-patch-1.1.1.01"
+    tinkerId = "cnblogs-fir-1.1.1"
 
     // 构建多渠道补丁时使用
      buildAllFlavorsDir = "${bakPath}/${baseApkDir}"

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ android {`
`105`	`105`	`xiaomi {} // 小米商店`
`106`	`106`	`huawei {} // 华为商店`
`107`	`107`	`official {} // 官方版本`
	`108`	`+ fir{} // fir内测平台版本`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`// 批量渠道包值替换`