修复BUG

raee · raee · commit 48db30d3240f · 2017-11-12T21:40:22.000+08:00
diff --git a/app/src/main/java/com/rae/cnblogs/CnblogsApplication.java b/app/src/main/java/com/rae/cnblogs/CnblogsApplication.java
@@ -38,7 +38,6 @@ public void onCreate() {
 
         // 级别较高的初始化操作
         DbCnblogs.init(getApplication());
-        // TODO:日志上报
         if (!BuildConfig.DEBUG) {
             // 正式环境
             Bugly.init(getApplication(), BuildConfig.BUGLY_APP_ID, false);
diff --git a/app/src/main/java/com/rae/cnblogs/activity/MainActivity.java b/app/src/main/java/com/rae/cnblogs/activity/MainActivity.java
@@ -18,7 +18,6 @@
 import android.widget.TextView;
 
 import com.rae.cnblogs.AppMobclickAgent;
-import com.rae.cnblogs.AppStatusBar;
 import com.rae.cnblogs.AppUI;
 import com.rae.cnblogs.BuildConfig;
 import com.rae.cnblogs.R;
@@ -65,7 +64,6 @@ public class MainActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        AppStatusBar.setStatusbarToDark(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         if (!BuildConfig.DEBUG) {
diff --git a/app/src/main/java/com/rae/cnblogs/presenter/impl/BasePresenter.java b/app/src/main/java/com/rae/cnblogs/presenter/impl/BasePresenter.java
@@ -85,6 +85,7 @@ public <T> Observable<T> createObservable(Observable<T> observable) {
      * 网络是否可用
      */
     protected boolean isNetworkError() {
+        if (mContext == null) return true;
         ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
         if (cm == null) return false;
         NetworkInfo networkInfo = cm.getActiveNetworkInfo();
diff --git a/app/src/main/res/drawable/bg_category_lock_night.xml b/app/src/main/res/drawable/bg_category_lock_night.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <shape>
-        <corners android:radius="@dimen/default_radius"/>
-        <solid android:color="@color/categoryColor_night"/>
-    </shape>
+    <item>
+        <shape>
+            <corners android:radius="@dimen/default_radius"/>
+            <solid android:color="@color/categoryColor_night"/>
+        </shape>
+    </item>
 </selector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -24,8 +24,8 @@
     <string name="loading">正在加载…</string>
     <string name="signing">正在登录…</string>
     <string name="loading_web_user_info">请稍等片刻</string>
-    <string name="loading_user_info">遇见你真好「%s」..</string>
-    <string name="loading_blog_app">每一步的改变都不平凡..</string>
+    <string name="loading_user_info">「%s」遇见你真好</string>
+    <string name="loading_blog_app">每一步的改变都不平凡</string>
     <string name="loading_user_info_finish">技术改变世界</string>
     <string name="login_retry_error">多次登录失败？试试官方网页登录吧！</string>
     <string name="login_retry">正在重试，请稍等片刻。</string>
@@ -80,7 +80,7 @@
     <string name="title_category">分类</string>
     <string name="i_get_it">我知道了</string>
     <string name="dialog_tips_post_comment">您伟大的讲话发表成功\n由于缓存更新较慢，请稍候再到评论区查看您已经发布的评论。\n您发表的评论长按可以进行删除。</string>
-    <string name="dialog_tips_post_like">由于缓存问题，点赞数量可能更新较慢哦。</string>
+    <string name="dialog_tips_post_like">点赞成功，由于缓存问题，点赞数量更新较慢。</string>
     <string name="tips_comment_success">发表评论成功</string>
     <string name="github">开源项目</string>
     <string name="agree">我同意</string>
@@ -101,7 +101,6 @@
     <string name="permission_tips_message">博客园需要读取/写入您的存储卡，禁止后部分功能受到限制，是否再次开启？</string>
     <string name="permission_granted">同意申请权限</string>
     <string name="feedback">意见反馈</string>
-    <string name="feedback_message">您收到新的意见反馈消息，是否前往查看？</string>
     <string name="view_now">立即查看</string>
     <string name="feedback_hint">请填写反馈信息</string>
     <string name="permission_request_message">博客园准备申请读取/写入您的内存卡权限，用于博客缓存以及图片缓存。</string>
@@ -120,7 +119,7 @@
     <string name="url_license">http://www.raeblog.com/cnblogs/license.html</string>
     <string name="system_message">系统消息</string>
     <string name="url_signin">https://passport.cnblogs.com/user/signin</string>
-    <string name="login_help_message">登录遇到问题您可以点击立即前往查看相关的问题以及原因，或者截图向我们进行意见反馈。</string>
+    <string name="login_help_message">您可以点击立即前往查看相关的问题以及原因，或者截图向我们进行意见反馈。</string>
     <string name="url_login_help">http://www.raeblog.com/cnblogs/loginHelp.html</string>
     <string name="url_blog_apply">https://passport.cnblogs.com/BlogApply.aspx</string>
     <string name="font_setting">字体设置</string>
diff --git a/app/tinker-support.gradle b/app/tinker-support.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.tencent.bugly.tinker-support'
 
-def bakPath = file("C:\\cnblosApp\\v1.0.1\\bakApk\\")
+def bakPath = file("F:\\rae\\cnblosApp\\v1.1.0\\bakApk\\")
 
 /**
  * 此处填写每次构建生成的基准包目录
@@ -35,9 +35,9 @@ tinkerSupport {
     baseApkResourceMapping = "${bakPath}/${baseApkDir}/${apkName}-R.txt"
 
     // 构建基准包和补丁包都要指定不同的tinkerId，并且必须保证唯一性
-    // 基类版本：cnblogs-basic-1.0.0
+    // 基类版本：cnblogs-basic-1.1.0
     // 补丁版本：cnblogs-path-1.0.0-001
-    tinkerId = "cnblogs-basic-1.0.1"
+    tinkerId = "cnblogs-basic-1.1.0"
 //    tinkerId = "cnblogs-path-1.0.0-001"
 
     // 构建多渠道补丁时使用
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=false
+enableHotfix=true
