[release v1.1.1]

Author: ChenRui

app/build.gradle

@@ -44,8 +44,8 @@ android {
         applicationId "com.rae.cnblogs"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 3
-        versionName "1.1.0"
+        versionCode 4
+        versionName "1.1.1"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField 'String', 'BUGLY_APP_ID', '"' + buglyAppId + '"'
@@ -97,9 +97,9 @@ android {
     // 渠道包定义，默认定义的名称就是渠道名称
     productFlavors {
         Dev {}          // 测试
-        baidu {}        // 百度手机助手
+//        baidu {}        // 百度手机助手
         yinyongbao {}   // 应用宝
-        m360 {}         // 360手机助手
+//        m360 {}         // 360手机助手
         pp {}           // PP助手
         meizu {}           // 魅族
         xiaomi {}       // 小米商店

app/src/main/java/com/rae/cnblogs/AppMobclickAgent.java

@@ -2,6 +2,8 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.text.TextUtils;
 
 import com.umeng.analytics.MobclickAgent;
@@ -117,4 +119,20 @@ private static String withString(String text, String defValue) {
         return TextUtils.isEmpty(text) ? defValue : text;
     }
 
+    /**
+     * 点击版本更新事件
+     */
+    public static void onUpdateEvent(Context context) {
+        String versionName = "1.0.0";
+        try {
+            PackageInfo am = context.getPackageManager().getPackageInfo(context.getPackageName(), PackageManager.GET_META_DATA);
+            versionName = am.versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        MobclickAgent.onEvent(context, "APP_UPDATE", versionName);
+    }
+
+
 }

app/src/main/java/com/rae/cnblogs/activity/MainActivity.java

@@ -66,10 +66,11 @@ public class MainActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        if (!BuildConfig.DEBUG) {
-            // 跳启动页
-            startActivity(new Intent(this, LauncherActivity.class));
-        }
+
+//        if (!BuildConfig.DEBUG) {
+//            // 跳启动页
+//            startActivity(new Intent(this, LauncherActivity.class));
+//        }
 
         EventBus.getDefault().register(this);
         mServiceConnection = new ServiceConnection() {

app/src/main/java/com/rae/cnblogs/dialog/impl/VersionUpdateDialog.java

@@ -5,6 +5,7 @@
 import android.net.Uri;
 import android.text.Html;
 
+import com.rae.cnblogs.AppMobclickAgent;
 import com.rae.cnblogs.AppUI;
 import com.rae.cnblogs.R;
 import com.rae.cnblogs.dialog.IAppDialog;
@@ -41,13 +42,17 @@ public void setVersionInfo(final VersionInfo versionInfo) {
             public void onClick(IAppDialog dialog, int buttonType) {
                 // 启动第三方
                 dialog.dismiss();
+
+                // 统计更新
+                AppMobclickAgent.onUpdateEvent(getContext());
+
                 try {
                     Intent intent = new Intent(Intent.ACTION_VIEW);
                     intent.setData(Uri.parse(versionInfo.getDownloadUrl()));
                     getContext().startActivity(intent);
                 } catch (Exception e) {
                     e.printStackTrace();
-                    AppUI.failed(getContext(), "未找到下载的应用程序！");
+                    AppUI.failed(getContext(), "未找到关联的应用程序，请前往应用市场更新。");
                 }
             }
         });

app/src/main/java/com/rae/cnblogs/fragment/BlogListFragment.java

@@ -139,6 +139,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
             @Override
             public void onClick(View v) {
                 mItemAdapter.empty();
+                mItemAdapter.notifyDataSetChanged();
                 mBlogListPresenter.start();
             }
         });

app/src/main/java/com/rae/cnblogs/presenter/impl/MomentDetailPresenterImpl.java

@@ -3,11 +3,13 @@
 import android.content.Context;
 import android.text.TextUtils;
 
+import com.rae.cnblogs.AppMobclickAgent;
 import com.rae.cnblogs.R;
 import com.rae.cnblogs.message.PostMomentEvent;
 import com.rae.cnblogs.message.UserInfoEvent;
 import com.rae.cnblogs.presenter.IMomentDetailContract;
 import com.rae.cnblogs.sdk.ApiDefaultObserver;
+import com.rae.cnblogs.sdk.CnblogsApiException;
 import com.rae.cnblogs.sdk.CnblogsApiFactory;
 import com.rae.cnblogs.sdk.Empty;
 import com.rae.cnblogs.sdk.api.IFriendsApi;
@@ -16,6 +18,7 @@
 import com.rae.cnblogs.sdk.bean.MomentBean;
 import com.rae.cnblogs.sdk.bean.MomentCommentBean;
 import com.rae.swift.Rx;
+import com.tencent.bugly.crashreport.CrashReport;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -145,8 +148,17 @@ public void loadMore() {
 
     @Override
     public void postComment(String ingId, String userId, String commentId, String content) {
+
+        AppMobclickAgent.onClickEvent(mContext, "MOMENT_COMMENT");
+
         createObservable(mMomentApi.postComment(ingId, userId, commentId, content))
                 .subscribe(new ApiDefaultObserver<Empty>() {
+                    @Override
+                    public void onError(Throwable e) {
+                        super.onError(e);
+                        CrashReport.postCatchedException(new CnblogsApiException("闪存评论发生异常！", e));
+                    }
+
                     @Override
                     protected void onError(String message) {
                         mView.onPostCommentFailed(message);

app/src/main/java/com/rae/cnblogs/presenter/impl/blog/BlogCommentPresenterImpl.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import com.rae.cnblogs.AppMobclickAgent;
 import com.rae.cnblogs.presenter.IBlogCommentPresenter;
 import com.rae.cnblogs.presenter.impl.BasePresenter;
 import com.rae.cnblogs.sdk.ApiDefaultObserver;
@@ -40,6 +41,9 @@ public void loadMore() {
 
     @Override
     public void post(BlogCommentBean parent) {
+
+        AppMobclickAgent.onClickEvent(mContext, "BLOG_COMMENT");
+
         BlogBean blog = mView.getBlog();
         Observer<Empty> subscriber = new ApiDefaultObserver<Empty>() {
             @Override

app/src/main/java/com/rae/cnblogs/presenter/impl/news/NewsCommentPresenterImpl.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import com.rae.cnblogs.AppMobclickAgent;
 import com.rae.cnblogs.presenter.impl.blog.BlogCommentPresenterImpl;
 import com.rae.cnblogs.sdk.ApiDefaultObserver;
 import com.rae.cnblogs.sdk.Empty;
@@ -46,6 +47,9 @@ protected void accept(List<BlogCommentBean> data) {
 
     @Override
     public void post(BlogCommentBean parent) {
+
+        AppMobclickAgent.onClickEvent(mContext, "NEWS_COMMENT");
+
         BlogBean blog = mView.getBlog();
         Observer<Empty> subscriber = new ApiDefaultObserver<Empty>() {
             @Override

app/tinker-support.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.tencent.bugly.tinker-support'
 
-def bakPath = file("F:\\rae\\cnblosApp\\v1.1.0\\bakApk\\")
+def bakPath = file("F:\\rae\\cnblosApp\\v1.1.1\\bakApk\\")
 
 /**
  * 此处填写每次构建生成的基准包目录
@@ -37,7 +37,7 @@ tinkerSupport {
     // 构建基准包和补丁包都要指定不同的tinkerId，并且必须保证唯一性
     // 基类版本：cnblogs-basic-1.1.0
     // 补丁版本：cnblogs-path-1.0.0-001
-    tinkerId = "cnblogs-basic-1.1.0"
+    tinkerId = "cnblogs-basic-1.1.1"
 //    tinkerId = "cnblogs-path-1.0.0-001"
 
     // 构建多渠道补丁时使用

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