修复bugly的问题

raee · raee · commit 47d5696ba7a9 · 2017-11-10T01:35:11.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,9 +27,9 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
-    dexOptions {
-        javaMaxHeapSize '2g'
-    }
+//    dexOptions {
+//        javaMaxHeapSize '2g'
+//    }
 
     signingConfigs {
         release {
@@ -64,6 +64,12 @@ android {
         manifestPlaceholders = [
                 UMENG_APPKEY: umengAppKey
         ]
+
+        ndk {
+            // fix bug #504 64位系统webView问题
+            abiFilters "armeabi"
+            abiFilters "armeabi-v7a"
+        }
     }
     buildTypes {
         debug {
@@ -104,6 +110,7 @@ android {
     productFlavors.all { flavor ->
         flavor.manifestPlaceholders = [UMENG_CHANNEL: name, BUGLY_CHANNEL: name]
     }
+
 }
 
 dependencies {
diff --git a/app/src/main/java/com/rae/cnblogs/ThemeCompat.java b/app/src/main/java/com/rae/cnblogs/ThemeCompat.java
@@ -40,7 +40,10 @@ public View createView(@NonNull Context context, String name, @NonNull Attribute
                 } catch (Throwable e) {
                     e.printStackTrace();
                 }
-                return new RaeSkinImageViewV4(context, attributeSet);
+
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
+                    return new RaeSkinImageViewV4(context, attributeSet);
+                }
             }
             return null;
         }
diff --git a/app/src/main/java/com/rae/cnblogs/adapter/BaseItemAdapter.java b/app/src/main/java/com/rae/cnblogs/adapter/BaseItemAdapter.java
@@ -73,6 +73,10 @@ public void onBindViewHolder(VH holder, int position) {
     }
 
     protected void onBindItemClickListener(VH holder, int position, final T dataItem) {
+
+        // 加载中点击事件不处理
+        if (getItemViewType(position) == VIEW_TYPE_LOADING) return;
+
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/java/com/rae/cnblogs/adapter/MomentAdapter.java b/app/src/main/java/com/rae/cnblogs/adapter/MomentAdapter.java
@@ -97,12 +97,6 @@ public SimpleViewHolder onCreateViewHolder(LayoutInflater inflater, ViewGroup pa
         return new MomentHolder(inflateView(parent, R.layout.item_moment_list));
     }
 
-    @Override
-    protected void onBindItemClickListener(SimpleViewHolder holder, int position, MomentBean dataItem) {
-        if (getItemViewType(position) == VIEW_TYPE_LOADING) return;
-        super.onBindItemClickListener(holder, position, dataItem);
-    }
-
     @Override
     public void onBindViewHolder(SimpleViewHolder viewHolder, int position, MomentBean m) {
         int viewType = getItemViewType(position);
diff --git a/app/src/main/java/com/rae/cnblogs/adapter/MomentDetailAdapter.java b/app/src/main/java/com/rae/cnblogs/adapter/MomentDetailAdapter.java
@@ -164,7 +164,12 @@ private void onBindCommentViewHolder(MomentCommentHolder holder, MomentCommentBe
         SpannableString content = new SpannableString(m.getContent());
 
         if (!TextUtils.isEmpty(m.getAtAuthorName())) {
-            content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(holder.itemView.getContext(), R.color.colorPrimary)), 0, m.getAtAuthorName().length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            content.setSpan(
+                    new ForegroundColorSpan(ContextCompat.getColor(holder.itemView.getContext(), R.color.colorPrimary)),
+                    0,
+                    // fix bug #762
+                    Math.min(m.getAtAuthorName().length() + 1, content.length()),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
         if (!TextUtils.isEmpty(m.getAvatar())) {
             RaeImageLoader.displayHeaderImage(m.getAvatar(), holder.avatarView);
diff --git a/app/src/main/java/com/rae/cnblogs/adapter/MomentMessageAdapter.java b/app/src/main/java/com/rae/cnblogs/adapter/MomentMessageAdapter.java
@@ -43,13 +43,6 @@ public int getItemViewType(int position) {
         return super.getItemViewType(position);
     }
 
-    @Override
-    protected void onBindItemClickListener(SimpleViewHolder holder, int position, MomentCommentBean dataItem) {
-        if (getItemViewType(position) == VIEW_TYPE_LOADING) return;
-        super.onBindItemClickListener(holder, position, dataItem);
-    }
-
-
     @Override
     public SimpleViewHolder onCreateViewHolder(LayoutInflater inflater, ViewGroup parent, int viewType) {
         if (viewType == VIEW_TYPE_LOADING) {
diff --git a/app/src/main/java/com/rae/cnblogs/dialog/impl/ShareDialog.java b/app/src/main/java/com/rae/cnblogs/dialog/impl/ShareDialog.java
@@ -29,6 +29,7 @@
 import com.rae.cnblogs.dialog.IAppDialogClickListener;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.umeng.socialize.ShareAction;
+import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 import com.umeng.socialize.media.UMWeb;
@@ -245,6 +246,15 @@ protected void share(SHARE_MEDIA type) {
         }
 
         try {
+
+            UMShareAPI umShareAPI = UMShareAPI.get(getContext());
+
+            // fix bug #536 没有安装应用
+            if (getContext() instanceof Activity && !umShareAPI.isInstall((Activity) getContext(), type)) {
+                AppUI.failed(getContext(), "请安装" + type);
+                return;
+            }
+
             mShareAction.setPlatform(type);
             mShareAction.share();
         } catch (Exception e) {
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/BaseFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/BaseFragment.java
@@ -37,10 +37,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (mUnbinder != null) {
-            mUnbinder.unbind();
-            mUnbinder = null;
-        }
     }
 
     protected void onCreateView(View view) {
@@ -53,7 +49,8 @@ protected void onLoadData() {
     protected abstract int getLayoutId();
 
     protected CnblogSdkConfig config() {
-        return CnblogSdkConfig.getsInstance(getContext().getApplicationContext());
+        // fix bug #478
+        return CnblogSdkConfig.getsInstance(getContext());
     }
 
     protected int parseInt(String text) {
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/BlogContentFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/BlogContentFragment.java
@@ -215,7 +215,7 @@ public BlogBean getBlog() {
     @Override
     public void onLoadContentSuccess(String content) {
         // 可能会处于非主线程中，这里提交到主线程中去。
-        // fix bugly #354
+        // fix bugly #354 #562
         mContentLayout.post(new Runnable() {
             @Override
             public void run() {
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/BlogListFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/BlogListFragment.java
@@ -112,9 +112,16 @@ protected void onMobclickAgent(CategoryBean category) {
 
     @Override
     public void onDestroy() {
-        mItemAdapter.destroy();
-        mAppLayout.removeAllViews();
-        mRecyclerView.removeAllViews();
+        // fix bug #772
+        if (mBlogListPresenter != null)
+            mBlogListPresenter.destroy();
+        if (mItemAdapter != null)
+            mItemAdapter.destroy();
+        // fix bug #732
+        if (mAppLayout != null)
+            mAppLayout.removeAllViews();
+        if (mRecyclerView != null)
+            mRecyclerView.removeAllViews();
         EventBus.getDefault().unregister(this);
         super.onDestroy();
     }
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/CategoriesFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/CategoriesFragment.java
@@ -33,6 +33,7 @@
 import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.annotations.NonNull;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
@@ -43,6 +44,8 @@
  */
 public class CategoriesFragment extends BaseFragment implements CategoriesOverallAdapter.CategoryDragListener {
 
+    private Disposable mDisposable;
+
     public static CategoriesFragment newInstance(List<CategoryBean> data) {
         Bundle args = new Bundle();
         args.putParcelableArrayList("data", (ArrayList<CategoryBean>) data);
@@ -279,7 +282,7 @@ private void saveSort(final boolean enableNotify) {
 
         final String tag = "updateCategories";
 
-        Observable.just(result)
+        mDisposable = Observable.just(result)
                 .subscribeOn(Schedulers.io())
                 .map(new Function<List<CategoryBean>, List<CategoryBean>>() {
                     @Override
@@ -321,7 +324,10 @@ public void accept(@NonNull Empty empty) throws Exception {
                     }
                 });
 
-        getActivity().setResult(Activity.RESULT_OK);
+        // fix bug #512
+        if (getActivity() != null) {
+            getActivity().setResult(Activity.RESULT_OK);
+        }
 
     }
 
@@ -352,9 +358,15 @@ public void run() {
 
     @Override
     public void onDestroy() {
+
         if (mCategoryAdapter != null) {
             mCategoryAdapter.setOnDataSetFinishListener(null);
         }
+        // fix bug #385
+        if (mDisposable != null && !mDisposable.isDisposed()) {
+            mDisposable.dispose();
+        }
+
         mHandler.removeMessages(0);
         mHandler = null;
         super.onDestroy();
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/MineFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/MineFragment.java
@@ -109,12 +109,11 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
                 .subscribe(new ApiDefaultObserver<Integer>() {
                     @Override
                     protected void onError(String message) {
-
                     }
 
                     @Override
                     protected void accept(Integer integer) {
-                        if (integer == null) return;
+                        if (integer == null || getContext() == null) return;
                         mSystemMessageBadgeView.setVisibility(config().getMessageCount() != integer ? View.VISIBLE : View.INVISIBLE);
                     }
                 });
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/SearchFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/SearchFragment.java
@@ -111,7 +111,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     }
 
 
-
     private void initView() {
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         mSuggestionAdapter = new SearchSuggestionAdapter();
@@ -161,7 +160,8 @@ public void onClick(View v) {
             @Override
             public void onChanged() {
                 super.onChanged();
-                if (mSuggestionAdapter.getItemCount() > 0) {
+                // fix bug #506
+                if (mRecyclerView != null && mSuggestionAdapter.getItemCount() > 0) {
                     mRecyclerView.setVisibility(View.VISIBLE);
                 }
             }
diff --git a/app/src/main/java/com/rae/cnblogs/presenter/IBlogListPresenter.java b/app/src/main/java/com/rae/cnblogs/presenter/IBlogListPresenter.java
@@ -18,6 +18,8 @@ public interface IBlogListPresenter extends IRaePresenter {
      */
     void refreshDataSet();
 
+    void destroy();
+
     interface IBlogListView {
 
         void onLoadBlogList(int pageIndex, List<BlogBean> data);
diff --git a/app/src/main/java/com/rae/cnblogs/presenter/impl/LauncherPresenterImpl.java b/app/src/main/java/com/rae/cnblogs/presenter/impl/LauncherPresenterImpl.java
@@ -115,6 +115,7 @@ protected void accept(AdvertBean advertBean) {
 
 
                         private void onSuccess(AdvertBean data) {
+                            if (mView == null) return; // fix bug #674
                             if (data == null || TextUtils.isEmpty(data.getImage_url())) {
                                 mView.onNormalImage();
                                 return;
diff --git a/app/src/main/java/com/rae/cnblogs/presenter/impl/kb/KBContentPresenterImpl.java b/app/src/main/java/com/rae/cnblogs/presenter/impl/kb/KBContentPresenterImpl.java
@@ -10,6 +10,7 @@
 import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 
 /**
@@ -18,6 +19,8 @@
  */
 public class KBContentPresenterImpl extends BlogContentPresenterImpl {
 
+    private Disposable mDisposable;
+
     public KBContentPresenterImpl(Context context, IBlogContentView view) {
         super(context, view);
     }
@@ -32,7 +35,7 @@ public void doLike(boolean isCancel) {
 
         // 不支持取消点赞
         if (isCancel) {
-            Observable.timer(1000, TimeUnit.MILLISECONDS)
+            mDisposable = Observable.timer(1000, TimeUnit.MILLISECONDS)
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(new Consumer<Long>() {
                         @Override
@@ -45,4 +48,13 @@ public void accept(Long aLong) throws Exception {
         Observable<Empty> observable = mBlogApi.likeKb(mView.getBlog().getBlogId());
         createObservable(false, observable, true);
     }
+
+    @Override
+    public void destroy() {
+        super.destroy();
+        // fix bug #726
+        if (mDisposable != null) {
+            mDisposable.dispose();
+        }
+    }
 }
diff --git a/app/src/main/java/com/rae/cnblogs/service/CnblogsService.java b/app/src/main/java/com/rae/cnblogs/service/CnblogsService.java
@@ -44,16 +44,16 @@ private void checkCacheSize() {
             boolean isInsufficient = appDataManager.isInsufficient(); // 是否空间不足
             double dbSize = appDataManager.getDatabaseTotalSize();
 //            Log.i("rae-service", "是否空间不够：" + isInsufficient + "; 数据库缓存大小：" + dbSize);
-            // 当数据大于50MB，清空博客缓存数据
-            if (dbSize > 50 || isInsufficient) {
+            // 当数据大于30MB，清空博客缓存数据
+            if (dbSize > 30 || isInsufficient) {
 //                Log.i("rae-service", "清除数据！" + dbSize);
                 DbFactory.getInstance().clearData();
             }
 
             // 清除缓存目录
             long cacheSize = appDataManager.getCacheSize();
             // 缓存大小超过1G，或者空间不足的时候清除缓存目录
-            if (cacheSize > 1024 || isInsufficient) {
+            if (cacheSize > 600 || isInsufficient) {
 //                Log.i("rae-service", "清除缓存！" + cacheSize);
                 appDataManager.clearCache();
             }
diff --git a/app/src/main/java/com/rae/cnblogs/service/job/AsyncDownloadJob.java b/app/src/main/java/com/rae/cnblogs/service/job/AsyncDownloadJob.java
@@ -2,6 +2,8 @@
 
 import android.util.Log;
 
+import com.tencent.bugly.crashreport.CrashReport;
+
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -23,8 +25,13 @@ protected void execute(Runnable runnable) {
             Log.e("rae", "线程池已经结束！");
             return;
         }
-        // 延迟周期运行，避免过多的CPU消耗
-        mExecutorService.schedule(runnable, 1500, TimeUnit.MILLISECONDS);
+        try {
+            // 延迟周期运行，避免过多的CPU消耗
+            mExecutorService.schedule(runnable, 1500, TimeUnit.MILLISECONDS);
+        } catch (Throwable e) {
+            // 上传异常
+            CrashReport.postCatchedException(e);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/rae/cnblogs/widget/RaeDrawerLayout.java b/app/src/main/java/com/rae/cnblogs/widget/RaeDrawerLayout.java
diff --git a/app/src/main/java/com/rae/cnblogs/widget/webclient/RaeWebViewClient.java b/app/src/main/java/com/rae/cnblogs/widget/webclient/RaeWebViewClient.java
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/db/DbBlog.java b/sdk/src/main/java/com/rae/cnblogs/sdk/db/DbBlog.java
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/db/DbCnblogs.java b/sdk/src/main/java/com/rae/cnblogs/sdk/db/DbCnblogs.java

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,10 @@ public View createView(@NonNull Context context, String name, @NonNull Attribute`
`40`	`40`	`} catch (Throwable e) {`
`41`	`41`	`e.printStackTrace();`
`42`	`42`	`}`
`43`		`- return new RaeSkinImageViewV4(context, attributeSet);`
	`43`	`+`
	`44`	`+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {`
	`45`	`+ return new RaeSkinImageViewV4(context, attributeSet);`
	`46`	`+ }`
`44`	`47`	`}`
`45`	`48`	`return null;`
`46`	`49`	`}`