修复线上BUG，解决登录后我的专栏重叠问题

raedev · raedev · commit 6970d78994e5 · 2019-03-19T18:35:01.000+08:00
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/src/main/java/com/rae/cnblogs/MainActivity.java b/app/src/main/java/com/rae/cnblogs/MainActivity.java
@@ -22,7 +22,6 @@
 import com.rae.cnblogs.basic.AppFragmentAdapter;
 import com.rae.cnblogs.basic.BasicActivity;
 import com.rae.cnblogs.basic.rx.AndroidObservable;
-import com.rae.cnblogs.blog.CnblogsService;
 import com.rae.cnblogs.dialog.DefaultDialogFragment;
 import com.rae.cnblogs.dialog.VersionDialogFragment;
 import com.rae.cnblogs.home.main.MainContract;
@@ -35,8 +34,6 @@
 import com.rae.cnblogs.sdk.bean.VersionInfo;
 import com.rae.cnblogs.sdk.event.PostMomentEvent;
 import com.rae.cnblogs.sdk.event.UserInfoChangedEvent;
-import com.rae.cnblogs.theme.AppThemeManager;
-import com.rae.cnblogs.theme.ThemeCompat;
 import com.rae.cnblogs.widget.ITopScrollable;
 import com.umeng.socialize.UMShareAPI;
 
@@ -47,7 +44,6 @@
 import io.reactivex.ObservableSource;
 import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
-import skin.support.SkinCompatManager;
 
 @Route(path = AppRoute.PATH_APP_HOME)
 public class MainActivity extends BasicActivity implements MainContract.View, RaeTabLayout.OnTabSelectedListener {
@@ -71,18 +67,9 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         mPresenter = new MainPresenterImpl(this);
-
         initTab();
-
         // 请求权限
         requestPermissions();
-
-        // 启动服务
-        startService(new Intent(this, CnblogsService.class));
-
-//        if (BuildConfig.DEBUG) {
-//            debugLogin();
-//        }
     }
 
 
diff --git a/module-blog/src/main/java/com/rae/cnblogs/blog/BlogRouteDialogFragment.java b/module-blog/src/main/java/com/rae/cnblogs/blog/BlogRouteDialogFragment.java
@@ -58,9 +58,13 @@ public void onLoadData(ContentEntity entity) {
 
     @Override
     public void onLoadDataFailed(String message) {
-        // 失败后，自动跳转网页
-        AppRoute.routeToWeb(getContext(), mUrl);
-        dismiss();
+        try {
+            // 失败后，自动跳转网页
+            AppRoute.routeToWeb(getContext(), mUrl);
+            dismiss();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
     }
 
     @Override
diff --git a/module-blog/src/main/java/com/rae/cnblogs/blog/ContentDetailActivity.java b/module-blog/src/main/java/com/rae/cnblogs/blog/ContentDetailActivity.java
@@ -11,6 +11,7 @@
 import com.google.gson.Gson;
 import com.rae.cnblogs.AppRoute;
 import com.rae.cnblogs.ContentEntityConverter;
+import com.rae.cnblogs.UICompat;
 import com.rae.cnblogs.activity.SwipeBackBasicActivity;
 import com.rae.cnblogs.basic.ContentEntity;
 import com.rae.cnblogs.basic.rx.AndroidObservable;
@@ -80,6 +81,10 @@ protected void accept(BlogBean blogBean) {
     }
 
     private void initBlogFragment(ContentEntity entity) {
+        if (entity == null) {
+            UICompat.failed(this, "博客实体为空");
+            return;
+        }
         BlogDetailFragment fragment = BlogDetailFragment.newInstance(entity);
         getSupportFragmentManager()
                 .beginTransaction()
diff --git a/module-blog/src/main/java/com/rae/cnblogs/blog/content/BasicBlogPresenterImpl.java b/module-blog/src/main/java/com/rae/cnblogs/blog/content/BasicBlogPresenterImpl.java
@@ -187,8 +187,6 @@ private void saveLocalData(List<BlogBean> data) {
                     public void onNext(List<BlogBean> blogBeans) {
                         // 入库
                         DbFactory.getInstance().getBlog().addAll(blogBeans);
-                        // 入库完成后，清除数据
-                        blogBeans.clear();
                     }
 
                     @Override
diff --git a/module-blog/src/main/java/com/rae/cnblogs/blog/detail/ContentDetailPresenterImpl.java b/module-blog/src/main/java/com/rae/cnblogs/blog/detail/ContentDetailPresenterImpl.java
@@ -226,7 +226,6 @@ public void loadBlogLocalStatus() {
                     public void subscribe(ObservableEmitter<UserBlogInfo> e) {
                         UserBlogInfo blogInfo = DbFactory.getInstance().getBlog().get(getView().getContentEntity().getId());
                         if (blogInfo == null) {
-                            e.onError(new NullPointerException("blog is null"));
                             return;
                         }
                         e.onNext(blogInfo);
diff --git a/module-blog/src/main/java/com/rae/cnblogs/blog/feed/FeedPresenterImpl.java b/module-blog/src/main/java/com/rae/cnblogs/blog/feed/FeedPresenterImpl.java
@@ -1,10 +1,7 @@
 package com.rae.cnblogs.blog.feed;
 
-import android.support.annotation.NonNull;
-
 import com.rae.cnblogs.basic.BasicPresenter;
 import com.rae.cnblogs.basic.rx.AndroidObservable;
-import com.rae.cnblogs.basic.rx.LifecycleProvider;
 import com.rae.cnblogs.sdk.ApiDefaultObserver;
 import com.rae.cnblogs.sdk.CnblogsApiFactory;
 import com.rae.cnblogs.sdk.bean.UserFeedBean;
@@ -24,13 +21,6 @@ public FeedPresenterImpl(FeedContract.View view) {
         super(view);
     }
 
-    @NonNull
-    @Override
-    public LifecycleProvider getLifecycleProvider() {
-        return null;
-    }
-
-
     @Override
     protected void onStart() {
         mPage = 1;
diff --git a/module-blog/src/main/java/com/rae/cnblogs/blog/fragment/CommentFragment.java b/module-blog/src/main/java/com/rae/cnblogs/blog/fragment/CommentFragment.java
@@ -246,16 +246,20 @@ public void onPostComment(EditCommentDialogFragment dialog, String content, @Nul
      * @param comment 引用的评论，可为空
      */
     private void showCommentDialog(@Nullable BlogCommentBean comment) {
-        EditCommentDialogFragment.Entry<BlogCommentBean> entry = null;
-        if (comment != null) {
-            entry = new EditCommentDialogFragment.Entry<>();
-            entry.setAuthorName(comment.getAuthorName());
-            entry.setContent(comment.getBody());
-            entry.setSource(comment);
-        }
+        try {
+            EditCommentDialogFragment.Entry<BlogCommentBean> entry = null;
+            if (comment != null) {
+                entry = new EditCommentDialogFragment.Entry<>();
+                entry.setAuthorName(comment.getAuthorName());
+                entry.setContent(comment.getBody());
+                entry.setSource(comment);
+            }
 
-        mEditCommentDialogFragment = EditCommentDialogFragment.newInstance(EditCommentDialogFragment.FROM_TYPE_BLOG, entry);
-        mEditCommentDialogFragment.show(getChildFragmentManager(), "EditCommentDialogFragment");
+            mEditCommentDialogFragment = EditCommentDialogFragment.newInstance(EditCommentDialogFragment.FROM_TYPE_BLOG, entry);
+            mEditCommentDialogFragment.show(getChildFragmentManager(), "EditCommentDialogFragment");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
     }
 
     @Override
diff --git a/module-blog/src/main/java/com/rae/cnblogs/blog/fragment/MultipleTypeBlogListFragment.java b/module-blog/src/main/java/com/rae/cnblogs/blog/fragment/MultipleTypeBlogListFragment.java
@@ -210,6 +210,8 @@ public void onLoginExpired() {
 
     @Override
     public void scrollToTop() {
+        if (mRecyclerView == null) return;
+
         if (mRecyclerView.isOnTop()) {
             mAppLayout.autoRefresh();
         } else {
diff --git a/module-discover/src/main/java/com/rae/cnblogs/discover/fragment/AntColumnFragment.java b/module-discover/src/main/java/com/rae/cnblogs/discover/fragment/AntColumnFragment.java
@@ -138,6 +138,7 @@ public void onNoMoreData() {
 
     @Override
     public void onEmptyData(String msg) {
+        dismissLogin();
         mRefreshLayout.setRefreshing(false);
         mAdapter.showEmpty(msg);
         mAdapter.loadMoreComplete();
diff --git a/module-discover/src/main/java/com/rae/cnblogs/discover/ui/AntColumnActivity.java b/module-discover/src/main/java/com/rae/cnblogs/discover/ui/AntColumnActivity.java
@@ -21,6 +21,7 @@
 import java.util.List;
 
 import butterknife.BindView;
+import butterknife.OnClick;
 
 
 /**
@@ -50,6 +51,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mViewPager.setCurrentItem(position);
     }
 
+    @OnClick(R2.id.img_question)
+    public void onQuestionClick() {
+        AppRoute.routeToAntColumnWeb(this, getString(R.string.url_antcode_about));
+    }
+
     class AntColumnAdapter extends FragmentPagerAdapter {
         private final List<String> titles = new ArrayList<>();
         private final List<Integer> mTypes = new ArrayList<>();
diff --git a/module-discover/src/main/res/drawable-xhdpi/icon_column_question.png b/module-discover/src/main/res/drawable-xhdpi/icon_column_question.png
diff --git a/module-discover/src/main/res/drawable-xxhdpi/icon_column_question.png b/module-discover/src/main/res/drawable-xxhdpi/icon_column_question.png
diff --git a/module-discover/src/main/res/drawable-xxxhdpi/icon_column_question.png b/module-discover/src/main/res/drawable-xxxhdpi/icon_column_question.png
diff --git a/module-discover/src/main/res/layout/activity_ant_column.xml b/module-discover/src/main/res/layout/activity_ant_column.xml
@@ -52,6 +52,14 @@
             app:tabTextAppearance="@style/TabTextAppearance.Ant"
             app:tabTextColor="#FF4A4A4A" />
 
+        <ImageView
+            android:id="@+id/img_question"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center"
+            android:layout_marginEnd="18dp"
+            android:src="@drawable/icon_column_question" />
+
     </android.support.v7.widget.FitWindowsFrameLayout>
 
 
diff --git a/module-discover/src/main/res/layout/item_discover_mine_column.xml b/module-discover/src/main/res/layout/item_discover_mine_column.xml
@@ -53,7 +53,7 @@
                 android:paddingBottom="2dp"
                 android:text="18讲"
                 android:textColor="#FF9B9B9B"
-                android:textSize="12sp"/>
+                android:textSize="12sp" />
 
             <TextView
                 android:id="@+id/tv_author"
@@ -79,7 +79,9 @@
             android:layout_height="0dp"
             android:layout_marginTop="7dp"
             android:layout_weight="1"
+            android:ellipsize="end"
             android:lineSpacingMultiplier="1.2"
+            android:lines="2"
             android:text="--"
             android:textColor="#FF878C97"
             android:textSize="13sp"
diff --git a/module-discover/src/main/res/values/strings.xml b/module-discover/src/main/res/values/strings.xml
@@ -12,4 +12,5 @@
     <string name="study_now">立即学习</string>
     <string name="format_article_updated">已更新%d篇文章</string>
     <string name="unsubscribe_success">取消订阅成功</string>
+    <string name="url_antcode_about">https://app.mayizhuanlan.com/about</string>
 </resources>
diff --git a/module-home/src/main/java/com/rae/cnblogs/home/MineFragment.java b/module-home/src/main/java/com/rae/cnblogs/home/MineFragment.java
@@ -181,6 +181,7 @@ public void onFansClick() {
 
     @OnClick(R2.id.layout_account_follow)
     public void onFollowClick() {
+        if (UserProvider.getInstance().isNotLogin()) return;
         AppRoute.routeToFollow(this.getContext(), getString(R.string.me), UserProvider.getInstance().getLoginUserInfo().getBlogApp());
     }
 
diff --git a/module-middleware/src/main/java/com/rae/cnblogs/AppRoute.java b/module-middleware/src/main/java/com/rae/cnblogs/AppRoute.java
@@ -20,6 +20,7 @@
 import com.rae.cnblogs.sdk.bean.CategoryBean;
 import com.rae.cnblogs.sdk.bean.MomentBean;
 import com.rae.cnblogs.sdk.model.MomentMetaData;
+import com.tencent.bugly.crashreport.CrashReport;
 
 import org.json.JSONObject;
 
@@ -251,9 +252,14 @@ public static void route(Context context, String path) {
      * 博客正文界面
      */
     public static void routeToContentDetail(Context context, ContentEntity entity) {
-        ARouter.getInstance().build(PATH_CONTENT_DETAIL)
-                .withParcelable("entity", entity)
-                .navigation(context);
+        try {
+            ARouter.getInstance().build(PATH_CONTENT_DETAIL)
+                    .withParcelable("entity", entity)
+                    .navigation(context);
+        } catch (Exception ex) {
+            CrashReport.postCatchedException(new RuntimeException("跳转到博文详情异常", ex));
+            UICompat.failed(context, "跳转异常");
+        }
     }
 
     /**
diff --git a/module-middleware/src/main/java/com/rae/cnblogs/CnblogsApplication.java b/module-middleware/src/main/java/com/rae/cnblogs/CnblogsApplication.java
@@ -1,5 +1,6 @@
 package com.rae.cnblogs;
 
+import android.content.Intent;
 import android.util.Log;
 
 import com.antcode.sdk.AntCodeSDK;
@@ -33,6 +34,8 @@ public class CnblogsApplication extends BasicApplication implements SkinObserver
     protected void onFirstCreate() {
         super.onFirstCreate();
 
+        startCnblogServices();
+
         QMUISwipeBackActivityManager.init(this);
 
         // 主题初始化
@@ -57,6 +60,18 @@ protected void onFirstCreate() {
         // Bugly
         CrashReport.initCrashReport(this, BuildConfig.BUGLY_APP_ID, BuildConfig.DEBUG);
         initUMConfig();
+
+    }
+
+    // 启动博客园服务
+    private void startCnblogServices() {
+        try {
+            Intent serviceIntent = new Intent();
+            serviceIntent.setClassName(getPackageName(), "com.rae.cnblogs.blog.CnblogsService");
+            startService(serviceIntent);
+        } catch (Exception ex) {
+            Log.e("Rae", "启动博客园服务失败", ex);
+        }
     }
 
     public void clearCache() {
diff --git a/module-resource/src/main/res/xml/app_file_paths.xml b/module-resource/src/main/res/xml/app_file_paths.xml
@@ -3,7 +3,14 @@
     <cache-path
         name="cache_path"
         path="/" />
-    <external-path name="external_files" path="."/>
+    <external-path
+        name="external_files"
+        path="." />
+
+    <root-path
+        name="camera_photos"
+        path="." />
+
     <external-cache-path
         name="external-cache-path"
         path="/" />
diff --git a/module-sdk/build.gradle b/module-sdk/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     implementation rootProject.ext.dependencies.greendao
 
 
-    api 'com.antcode:sdk:1.0.1'
+    api 'com.antcode:sdk:1.0.2'
 //    api rootProject.ext.dependencies.rxjava
 //    api rootProject.ext.dependencies.rxandroid
     api rootProject.ext.dependencies.jsoup
diff --git a/module-sdk/src/main/java/com/rae/cnblogs/sdk/db/DbCategory.java b/module-sdk/src/main/java/com/rae/cnblogs/sdk/db/DbCategory.java
@@ -25,8 +25,12 @@ public class DbCategory {
      * @param list 数据
      */
     public void reset(final List<CategoryBean> list) {
-        mSession.getCategoryBeanDao().deleteAll();
-        mSession.getCategoryBeanDao().insertInTx(list);
+        try {
+            mSession.getCategoryBeanDao().deleteAll();
+            mSession.getCategoryBeanDao().insertInTx(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
 
     }
 
diff --git a/module-user/src/main/java/com/rae/cnblogs/user/activity/AvatarActivity.java b/module-user/src/main/java/com/rae/cnblogs/user/activity/AvatarActivity.java
diff --git a/module-user/src/main/java/com/rae/cnblogs/user/fragment/FriendsFragment.java b/module-user/src/main/java/com/rae/cnblogs/user/fragment/FriendsFragment.java
diff --git a/module-widget/src/main/java/com/rae/cnblogs/UICompat.java b/module-widget/src/main/java/com/rae/cnblogs/UICompat.java
diff --git a/module-widget/src/main/java/com/rae/cnblogs/widget/drag/DragRecylerViewAdapter.java b/module-widget/src/main/java/com/rae/cnblogs/widget/drag/DragRecylerViewAdapter.java

Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,6 @@ private void saveLocalData(List<BlogBean> data) {`
`187`	`187`	`public void onNext(List<BlogBean> blogBeans) {`
`188`	`188`	`// 入库`
`189`	`189`	`DbFactory.getInstance().getBlog().addAll(blogBeans);`
`190`		`- // 入库完成后，清除数据`
`191`		`- blogBeans.clear();`
`192`	`190`	`}`
`193`	`191`
`194`	`192`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,6 @@ public void loadBlogLocalStatus() {`
`226`	`226`	`public void subscribe(ObservableEmitter<UserBlogInfo> e) {`
`227`	`227`	`UserBlogInfo blogInfo = DbFactory.getInstance().getBlog().get(getView().getContentEntity().getId());`
`228`	`228`	`if (blogInfo == null) {`
`229`		`- e.onError(new NullPointerException("blog is null"));`
`230`	`229`	`return;`
`231`	`230`	`}`
`232`	`231`	`e.onNext(blogInfo);`