发布1.1.4版本

修复华为nova 2s进入设置界面闪退的bug
l376571926 · Oct 8, 2018 · acf29b7 · acf29b7
1 parent 64319aa
commit acf29b7
Show file tree

Hide file tree

Showing 19 changed files with 73 additions and 230 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 27
         versionCode 1
-        versionName "1.1.3"
+        versionName "1.1.4"
         //指定room.schemaLocation生成的文件路径
         javaCompileOptions {
             annotationProcessorOptions {

diff --git a/app/src/main/java/group/tonight/vipvideohelper/App.java b/app/src/main/java/group/tonight/vipvideohelper/App.java
@@ -22,9 +22,9 @@ public void onCreate() {
         CrashHandler.getInstance().init(this);
         PrefUtils.init(this);
         okHttpClient = new OkHttpClient.Builder()
-                .connectTimeout(2000, TimeUnit.MILLISECONDS)
-                .readTimeout(2000, TimeUnit.MILLISECONDS)
-                .writeTimeout(2000, TimeUnit.MILLISECONDS)
+//                .connectTimeout(2000, TimeUnit.MILLISECONDS)
+//                .readTimeout(2000, TimeUnit.MILLISECONDS)
+//                .writeTimeout(2000, TimeUnit.MILLISECONDS)
                 .build();
         //搜集本地tbs内核信息并上报服务器，服务器返回结果决定使用哪个内核。
 //        QbSdk.PreInitCallback cb = new QbSdk.PreInitCallback() {

diff --git a/app/src/main/java/group/tonight/vipvideohelper/activities/HomeActivity.java b/app/src/main/java/group/tonight/vipvideohelper/activities/HomeActivity.java
@@ -1,9 +1,14 @@
 package group.tonight.vipvideohelper.activities;
 
+import android.arch.lifecycle.Observer;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -22,7 +27,15 @@
 import com.mikepenz.material_design_iconic_typeface_library.MaterialDesignIconic;
 import com.socks.library.KLog;
 
+import java.util.List;
+
 import group.tonight.vipvideohelper.R;
+import group.tonight.vipvideohelper.model.VersionUpdateBean;
+import group.tonight.vipvideohelper.other.Consts;
+import group.tonight.vipvideohelper.other.PrefUtils;
+import group.tonight.vipvideohelper.other.QRCodeUtils;
+import group.tonight.vipvideohelper.other.UpdateDialogHelper;
+import group.tonight.vipvideohelper.other.VersionUpdateTask;
 import group.tonight.vipvideohelper.other.WebViewHelper;
 
 public class HomeActivity extends AppCompatActivity {
@@ -85,6 +98,28 @@ public void onPageFinished(WebView view, String url) {
         });
         mVideoUrlArrays = getResources().getStringArray(R.array.defaults_video_url_array);
         mWebView.loadUrl(mVideoUrlArrays[0]);
+
+        VersionUpdateTask versionUpdateTask = new VersionUpdateTask();
+        versionUpdateTask.observe(this, new Observer<VersionUpdateBean>() {
+            @Override
+            public void onChanged(@Nullable VersionUpdateBean versionUpdateBean) {
+                if (versionUpdateBean == null) {
+                    return;
+                }
+                String tag_name = versionUpdateBean.getTag_name();//线上版本号
+                if (tag_name == null) {
+                    return;
+                }
+                try {
+                    if (tag_name.compareTo(getPackageManager().getPackageInfo(getPackageName(), 0).versionName) != 0) {
+                        //发现新版本
+                        new UpdateDialogHelper(HomeActivity.this, versionUpdateBean).show();
+                    }
+                } catch (PackageManager.NameNotFoundException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
     }
 
     @Override

diff --git a/app/src/main/java/group/tonight/vipvideohelper/activities/SettingActivity.java b/app/src/main/java/group/tonight/vipvideohelper/activities/SettingActivity.java
@@ -30,6 +30,7 @@ public class SettingActivity extends BaseBackActivity implements View.OnClickLis
     private ImageView mShareAppImageView;
     private VersionUpdateBean mVersionUpdateBean;
     private View mNewVersionView;
+    private String mTag_name;
 
     @Override
     protected int setActivityTitle() {
@@ -47,26 +48,37 @@ protected void onCreate(Bundle savedInstanceState) {
 
         VersionUpdateTask versionUpdateTask = new VersionUpdateTask();
         versionUpdateTask.observe(this, new Observer<VersionUpdateBean>() {
+
+
             @Override
             public void onChanged(@Nullable VersionUpdateBean versionUpdateBean) {
                 if (versionUpdateBean == null) {
                     return;
                 }
                 List<VersionUpdateBean.AssetsBean> assetsBeanList = versionUpdateBean.getAssets();
+                mTag_name = versionUpdateBean.getTag_name();
+                if (mTag_name == null) {
+                    return;
+                }
                 if (assetsBeanList == null) {
                     return;
                 }
                 if (assetsBeanList.isEmpty()) {
                     return;
                 }
                 VersionUpdateBean.AssetsBean assetsBean = assetsBeanList.get(0);
-                Bitmap bitmap = QRCodeUtils.createQRCodeWithLogo(assetsBean.getBrowser_download_url(), BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher));
+                Bitmap decodeResource = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);
+                Bitmap bitmap = QRCodeUtils.createQRCodeWithLogo(assetsBean.getBrowser_download_url(), decodeResource);
                 mShareAppImageView.setImageBitmap(bitmap);
 
-                if (PrefUtils.get().getInt(Consts.KEY_LAST_VERSION_ID, 0) < assetsBean.getId()) {
-                    //发现新版本
-                    mVersionUpdateBean = versionUpdateBean;
-                    mNewVersionView.setVisibility(View.VISIBLE);
+                try {
+                    if (mTag_name.compareTo(getPackageManager().getPackageInfo(getPackageName(), 0).versionName) != 0) {
+                        //发现新版本
+                        mVersionUpdateBean = versionUpdateBean;
+                        mNewVersionView.setVisibility(View.VISIBLE);
+                    }
+                } catch (PackageManager.NameNotFoundException e) {
+                    e.printStackTrace();
                 }
             }
         });
@@ -108,6 +120,7 @@ public void onClick(DialogInterface dialog, int which) {
                         .show();
                 break;
             case R.id.version:
+
                 if (mVersionUpdateBean == null) {
                     Toast.makeText(SettingActivity.this, "已经是最新版本", Toast.LENGTH_SHORT).show();
                 } else {

diff --git a/app/src/main/java/group/tonight/vipvideohelper/other/Consts.java b/app/src/main/java/group/tonight/vipvideohelper/other/Consts.java
@@ -4,7 +4,6 @@
 import java.util.Map;
 
 public class Consts {
-    public static final String KEY_LAST_VERSION_ID = "pref_last_version_id";
     public static final String KEY_LAST_DOWNLOAD_ID = "pref_last_download_id";
 
     public static final String[] xianlu = {

diff --git a/app/src/main/java/group/tonight/vipvideohelper/other/UpdateDialogHelper.java b/app/src/main/java/group/tonight/vipvideohelper/other/UpdateDialogHelper.java
@@ -23,10 +23,21 @@ public UpdateDialogHelper(Context context, VersionUpdateBean versionUpdateBean)
         mVersionUpdateBean = versionUpdateBean;
     }
 
-    public void show(){
+    public void show() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("版本号：")
+                .append(mVersionUpdateBean.getTag_name())
+                .append("\n")
+                .append("发布时间：")
+                .append(mVersionUpdateBean.getPublished_at())
+                .append("\n")
+                .append("更新内容：")
+                .append("\n")
+                .append(mVersionUpdateBean.getBody());
         new AlertDialog.Builder(mContext)
                 .setTitle("更新新版本")
-                .setMessage(mVersionUpdateBean.getBody())
+//                .setMessage(mVersionUpdateBean.getBody())
+                .setMessage(builder.toString())
                 .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {

diff --git a/app/src/main/java/group/tonight/vipvideohelper/services/DownLoadService.java b/app/src/main/java/group/tonight/vipvideohelper/services/DownLoadService.java
@@ -53,7 +53,6 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 PreferenceManager.getDefaultSharedPreferences(this)
                         .edit()
                         .putLong(Consts.KEY_LAST_DOWNLOAD_ID, manager.enqueue(down))
-                        .putInt(Consts.KEY_LAST_VERSION_ID, assetsBeanId)
                         .apply();
             }
         } catch (Exception e) {

diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml