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 {