修复BUG

ChenRui · ChenRui · commit 1cc61fae035b · 2017-09-13T19:38:24.000+08:00
diff --git a/.idea/dictionaries/Rae.xml b/.idea/dictionaries/Rae.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -71,8 +71,8 @@ android {
         DEV {}          // 测试
         baidu {}        // 百度手机助手
         yinyongbao {}   // 应用宝
-//        m360 {}         // 360手机助手
-//        pp {}           // PP助手
+        m360 {}         // 360手机助手
+        pp {}           // PP助手
         meizu {}           // 魅族
         xiaomi {}       // 小米商店
         huawei {}       // 华为商店
diff --git a/app/src/main/java/com/rae/cnblogs/activity/BlogContentActivity.java b/app/src/main/java/com/rae/cnblogs/activity/BlogContentActivity.java
@@ -226,7 +226,8 @@ private void onLoadData(BlogBean blog) {
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         transaction.add(R.id.fl_comment, mBlogCommentFragment);
         transaction.add(R.id.fl_content, mBlogContentFragment);
-        transaction.commit();
+        // fix bugly #472
+        transaction.commitAllowingStateLoss();
     }
 
     // 分享
diff --git a/app/src/main/java/com/rae/cnblogs/activity/LauncherActivity.java b/app/src/main/java/com/rae/cnblogs/activity/LauncherActivity.java
@@ -52,11 +52,10 @@ protected void onResume() {
         long mainExitTimeMillis = config().getMainExitTimeMillis();
         long span = System.currentTimeMillis() - mainExitTimeMillis;
 
-        // 第一次或者是程序退出的时间超过3分钟(180000)，就启动当前界面
-        if (mainExitTimeMillis <= 0 || span > 180000) {
+        // 第一次或者是程序退出的时间超过1分钟(60000)，就启动当前界面
+        if (mainExitTimeMillis <= 0 || span > 60000) {
             mLauncherPresenter.start();
         } else {
-
             // 跳过启动界面
             AppRoute.jumpToMain(this);
             Observable.timer(500, TimeUnit.MILLISECONDS)
@@ -98,6 +97,10 @@ public void onLoadImage(String name, String url) {
 
     @Override
     public void onJumpToWeb(String url) {
+        // 网页路径为空不跳转
+        if (TextUtils.isEmpty(url)) {
+            return;
+        }
         AppRoute.jumpToMain(this);
         AppRoute.jumpToWeb(this, url);
         finish();
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/BlogContentFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/BlogContentFragment.java
@@ -134,10 +134,17 @@ public BlogBean getBlog() {
 
     @Override
     public void onLoadContentSuccess(String content) {
-        mPlaceholderView.dismiss();
-        mWebView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
-        mWebView.loadUrl("file:///android_asset/view.html");
-//        mWebView.loadUrl("http://192.168.168.10:8080/r/test.html");
+        // 可能会处于非主线程中，这里提交到主线程中去。
+        // fix bugly #354
+        mContentLayout.post(new Runnable() {
+            @Override
+            public void run() {
+                mPlaceholderView.dismiss();
+                mWebView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
+                mWebView.loadUrl("file:///android_asset/view.html");
+            }
+        });
+
     }
 
     @Override
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/HomeFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/HomeFragment.java
@@ -79,6 +79,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         mHomePresenter.start();
     }
 
+
     @OnClick(R.id.img_edit_category)
     public void onCategoryClick(View view) {
         if (mCategoryBeanList == null || mCategoryBeanList.size() <= 0) {
@@ -91,6 +92,11 @@ public void onCategoryClick(View view) {
     @Override
     public void onLoadCategory(List<CategoryBean> data) {
 
+        if (!isAdded()) {
+            // 还没有加载
+            return;
+        }
+
         mCategoryBeanList = data;
         int count = mAdapter == null ? 0 : mAdapter.getCount();
 
@@ -131,7 +137,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         // 分类编辑返回
         if (requestCode == AppRoute.REQ_CODE_CATEGORY && resultCode == Activity.RESULT_OK) {
             mPosition = data != null ? data.getIntExtra("position", 0) : mViewPager.getCurrentItem();
-            mHomePresenter.start();
+            // 可能没有附加上去，fix bugly #352
+            mViewPager.post(new Runnable() {
+                @Override
+                public void run() {
+                    mHomePresenter.start();
+                }
+            });
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -32,7 +32,7 @@
     <string name="register">注册</string>
     <string name="login_tips">登录即表示同意</string>
     <string name="login_contract">博客园APP隐私说明</string>
-    <string name="login_contract_content">博客园APP已经开源，登录过程我们会收集您遇到的错误信息以及博客名称，但我们不会收集您的帐号密码信息，请放心登录。\n您在登录过程如有任何问题请联系博客园官方团\n对于博客园APP您有任何意见或者想法都可以随时联系作者raedev@qq.com</string>
+    <string name="login_contract_content">博客园APP已经开源，登录过程我们会收集您遇到的错误信息以及博客名称，但我们不会收集您的帐号密码信息，请放心登录。\n您在登录过程如有任何问题请联系博客园官方团队。contact@cnblogs.com\n</string>
     <string name="login_user_name_hint">用户名</string>
     <string name="login_password_hint">密码</string>
     <string name="login">登录</string>
diff --git a/app/src/xiaomi/res/values/strings.xml b/app/src/xiaomi/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">博客园APP</string>
+</resources>
diff --git a/gradle.properties b/gradle.properties
@@ -12,4 +12,4 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 # Enable/Disable Tinker HotFix
-enableHotfix=true
+enableHotfix=false

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,8 @@ private void onLoadData(BlogBean blog) {`
`226`	`226`	`FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();`
`227`	`227`	`transaction.add(R.id.fl_comment, mBlogCommentFragment);`
`228`	`228`	`transaction.add(R.id.fl_content, mBlogContentFragment);`
`229`		`- transaction.commit();`
	`229`	`+ // fix bugly #472`
	`230`	`+ transaction.commitAllowingStateLoss();`
`230`	`231`	`}`
`231`	`232`
`232`	`233`	`// 分享`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<resources>`
	`2`	`+ <string name="app_name">博客园APP</string>`
	`3`	`+</resources>`