From bda41d8a267f275ef0dc30851fd20469c97a66b5 Mon Sep 17 00:00:00 2001
From: juntao <chenjuntao@ghzhushou.com>
Date: Thu, 27 Aug 2020 15:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0=E6=8E=A8?=
 =?UTF-8?q?=E9=80=810827=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=20https://git?=
 =?UTF-8?q?lab.ghzs.com/pm/halo-app-issues/-/issues/946?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/gamecenter/manager/UpdateManager.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java
index 8a9bcf1c4c..ac399e327a 100644
--- a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java
+++ b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java
@@ -144,7 +144,8 @@ public class UpdateManager {
                     }
 
                     if (updateDialog != null && updateDialog.isShowing()) {
-                        if (DownloadStatus.done.equals(downloadEntity.getStatus())) {
+                        // 强制更新的时候完成下载不用更新页面
+                        if (DownloadStatus.done.equals(downloadEntity.getStatus()) && !appEntity.isForce()) {
                             updateUpdateDialogView(true);
                         }
                     } else {
@@ -155,7 +156,6 @@ public class UpdateManager {
                             }
                         }
                     }
-
                 }
             }
         }
@@ -236,6 +236,7 @@ public class UpdateManager {
                         }
                         if (response != null) {
                             if (!appEntity.isForce()
+                                    && isAutoCheck
                                     && !isUpdateFileDownloaded(response)
                                     && NetworkUtils.isWifiConnected(mContext)) {
                                 createUpdate(response, true);
@@ -327,7 +328,8 @@ public class UpdateManager {
                 updateDialog.dismiss();
             }
             String path = FileUtils.getDownloadPath(mContext, "光环助手V" + appEntity.getVersion() + "_" + md5 + ".apk");
-            if (isUpdateFileDownloaded(md5)) {
+            // 产品不接受显示下载完成文案从立即更新变为立即安装，所以文案为立即更新时一律不执行安装
+            if (isUpdateFileDownloaded(md5) && confirmTextView.getText() != "立即更新") {
                 DataLogUtils.uploadUpgradeLog(mContext, "install"); //上传更新安装数据
                 PackageInstaller.install(mContext, path);
             } else {