fix ignore update bug

MZCretin · Dec 8, 2017 · f3801ee · f3801ee
1 parent b7bc828
commit f3801ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/cretin/www/autoupdateproject/app/BaseApp.java b/app/src/main/java/com/cretin/www/autoupdateproject/app/BaseApp.java
@@ -13,7 +13,7 @@ public void onCreate() {
         CretinAutoUpdateUtils.Builder builder = new CretinAutoUpdateUtils.Builder()
                 .setBaseUrl("http://www.cretinzp.com/system/versioninfo")
                 .setIgnoreThisVersion(true)
-                .setShowType(CretinAutoUpdateUtils.Builder.TYPE_DIALOG_WITH_BACK_DOWN)
+                .setShowType(CretinAutoUpdateUtils.Builder.TYPE_DIALOG)
                 .setIconRes(R.mipmap.logo)
                 .showLog(true)
                 .setRequestMethod(CretinAutoUpdateUtils.Builder.METHOD_GET)

diff --git a/...ary/src/main/java/com/cretin/www/cretinautoupdatelibrary/utils/CretinAutoUpdateUtils.java b/...ary/src/main/java/com/cretin/www/cretinautoupdatelibrary/utils/CretinAutoUpdateUtils.java
@@ -181,7 +181,7 @@ public void destroy() {
         //不要忘了这一步
         if ( mContext != null && intent != null )
             mContext.stopService(intent);
-        if ( mContext != null && receiver != null ){
+        if ( mContext != null && receiver != null ) {
             mContext.unregisterReceiver(receiver);
             receiver = null;
         }
@@ -295,7 +295,16 @@ protected void onPostExecute(UpdateEntity data) {
                     }
                 } else if ( data.isForceUpdate == 0 ) {
                     if ( data.versionCode > getVersionCode(mContext) ) {
-                        showUpdateDialog(data, false, true);
+                        String dataVersion = data.versionName;
+                        if ( !TextUtils.isEmpty(dataVersion) ) {
+                            List listCodes = loadArray();
+                            if ( !listCodes.contains(dataVersion) ) {
+                                //没有设置为已忽略
+                                showUpdateDialog(data, false, true);
+                            } else {
+                                Log.e("cretinautoupdatelibrary", "自动更新library已经忽略此版本");
+                            }
+                        }
                     }
                 }
             } else {