优化代码

xuexiangjys · Jan 24, 2021 · 745c32b · 745c32b
1 parent 233c732
commit 745c32b
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 28 deletions.
diff --git a/xupdate-lib/src/main/java/com/xuexiang/xupdate/proxy/impl/DefaultUpdateParser.java b/xupdate-lib/src/main/java/com/xuexiang/xupdate/proxy/impl/DefaultUpdateParser.java
@@ -63,13 +63,15 @@ public UpdateEntity parseJson(String json) {
     /**
      * 进行本地版本判断[防止服务端出错，本来是不需要更新，但是服务端返回是需要更新]
      *
-     * @param checkResult
-     * @return
+     * @param checkResult 版本更新检查返回的结果
+     * @return 版本更新结果
      */
-    private CheckVersionResult doLocalCompare(CheckVersionResult checkResult) {
-        if (checkResult.getUpdateStatus() != CheckVersionResult.NO_NEW_VERSION) { //服务端返回需要更新
+    protected CheckVersionResult doLocalCompare(CheckVersionResult checkResult) {
+        //服务端返回需要更新
+        if (checkResult.getUpdateStatus() != CheckVersionResult.NO_NEW_VERSION) {
             int lastVersionCode = checkResult.getVersionCode();
-            if (lastVersionCode <= UpdateUtils.getVersionCode(XUpdate.getContext())) { //最新版本小于等于现在的版本，不需要更新
+            //最新版本小于等于现在的版本，不需要更新
+            if (lastVersionCode <= UpdateUtils.getVersionCode(XUpdate.getContext())) {
                 checkResult.setRequireUpgrade(CheckVersionResult.NO_NEW_VERSION);
             }
         }

diff --git a/xupdate-lib/src/main/java/com/xuexiang/xupdate/widget/UpdateDialog.java b/xupdate-lib/src/main/java/com/xuexiang/xupdate/widget/UpdateDialog.java
@@ -329,19 +329,27 @@ private void installApp() {
     @Override
     public void handleStart() {
         if (isShowing()) {
-            mNumberProgressBar.setVisibility(View.VISIBLE);
-            mBtnUpdate.setVisibility(View.GONE);
-            if (mPromptEntity.isSupportBackgroundUpdate()) {
-                mBtnBackgroundUpdate.setVisibility(View.VISIBLE);
-            } else {
-                mBtnBackgroundUpdate.setVisibility(View.GONE);
-            }
+            doStart();
+        }
+    }
+
+    private void doStart() {
+        mNumberProgressBar.setVisibility(View.VISIBLE);
+        mNumberProgressBar.setProgress(0);
+        mBtnUpdate.setVisibility(View.GONE);
+        if (mPromptEntity.isSupportBackgroundUpdate()) {
+            mBtnBackgroundUpdate.setVisibility(View.VISIBLE);
+        } else {
+            mBtnBackgroundUpdate.setVisibility(View.GONE);
         }
     }
 
     @Override
     public void handleProgress(float progress) {
         if (isShowing()) {
+            if (mNumberProgressBar.getVisibility() == View.GONE) {
+                doStart();
+            }
             mNumberProgressBar.setProgress(Math.round(progress * 100));
             mNumberProgressBar.setMax(100);
         }

diff --git a/xupdate-lib/src/main/java/com/xuexiang/xupdate/widget/UpdateDialogActivity.java b/xupdate-lib/src/main/java/com/xuexiang/xupdate/widget/UpdateDialogActivity.java
@@ -358,20 +358,27 @@ private void installApp() {
     @Override
     public void handleStart() {
         if (!isFinishing()) {
-            mNumberProgressBar.setVisibility(View.VISIBLE);
-            mNumberProgressBar.setProgress(0);
-            mBtnUpdate.setVisibility(View.GONE);
-            if (getPromptEntity().isSupportBackgroundUpdate()) {
-                mBtnBackgroundUpdate.setVisibility(View.VISIBLE);
-            } else {
-                mBtnBackgroundUpdate.setVisibility(View.GONE);
-            }
+            doStart();
+        }
+    }
+
+    private void doStart() {
+        mNumberProgressBar.setVisibility(View.VISIBLE);
+        mNumberProgressBar.setProgress(0);
+        mBtnUpdate.setVisibility(View.GONE);
+        if (mPromptEntity.isSupportBackgroundUpdate()) {
+            mBtnBackgroundUpdate.setVisibility(View.VISIBLE);
+        } else {
+            mBtnBackgroundUpdate.setVisibility(View.GONE);
         }
     }
 
     @Override
     public void handleProgress(float progress) {
         if (!isFinishing()) {
+            if (mNumberProgressBar.getVisibility() == View.GONE) {
+                doStart();
+            }
             mNumberProgressBar.setProgress(Math.round(progress * 100));
             mNumberProgressBar.setMax(100);
         }

diff --git a/xupdate-lib/src/main/java/com/xuexiang/xupdate/widget/UpdateDialogFragment.java b/xupdate-lib/src/main/java/com/xuexiang/xupdate/widget/UpdateDialogFragment.java
@@ -401,20 +401,27 @@ private void installApp() {
     @Override
     public void handleStart() {
         if (!UpdateDialogFragment.this.isRemoving()) {
-            mNumberProgressBar.setVisibility(View.VISIBLE);
-            mNumberProgressBar.setProgress(0);
-            mBtnUpdate.setVisibility(View.GONE);
-            if (getPromptEntity().isSupportBackgroundUpdate()) {
-                mBtnBackgroundUpdate.setVisibility(View.VISIBLE);
-            } else {
-                mBtnBackgroundUpdate.setVisibility(View.GONE);
-            }
+            doStart();
+        }
+    }
+
+    private void doStart() {
+        mNumberProgressBar.setVisibility(View.VISIBLE);
+        mNumberProgressBar.setProgress(0);
+        mBtnUpdate.setVisibility(View.GONE);
+        if (mPromptEntity.isSupportBackgroundUpdate()) {
+            mBtnBackgroundUpdate.setVisibility(View.VISIBLE);
+        } else {
+            mBtnBackgroundUpdate.setVisibility(View.GONE);
         }
     }
 
     @Override
     public void handleProgress(float progress) {
         if (!UpdateDialogFragment.this.isRemoving()) {
+            if (mNumberProgressBar.getVisibility() == View.GONE) {
+                doStart();
+            }
             mNumberProgressBar.setProgress(Math.round(progress * 100));
             mNumberProgressBar.setMax(100);
         }