From 22881a4d6409c7d17867e1d40bf81a13578208df Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 31 十月 2025 15:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateUtil.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateUtil.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateUtil.java
index cd748b5..3ee3621 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateUtil.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateUtil.java
@@ -57,6 +57,17 @@
// thread.interrupt();
// }
}
+
+ public boolean isShowing() {
+ if(updateDialog!=null&&updateDialog.isShowing()){
+ return true;
+ }
+ if(downloadDialog!=null&&downloadDialog.isShowing()){
+ return true;
+ }
+ return false;
+ }
+
public static interface VersionCallBack{
void isNeedUpdate(boolean isUpdate);
}
@@ -81,8 +92,8 @@
versionCallBack.isNeedUpdate(true);
upgradeurl=data.getFullFileUrl();
updatelog=data.getContent();
- newVerName = response.getData().getVersionInfo();
- doNewVersionUpdate(true);
+ newVerName = data.getVersionInfo();
+ doNewVersionUpdate(data.getIsForce()==1);
}else {
versionCallBack.isNeedUpdate(false);
}
@@ -117,6 +128,7 @@
}
}
+ private UpdateDialog updateDialog;
// 鏇存柊鏂扮増鏈�
public void doNewVersionUpdate(boolean type) {
StringBuffer sb = new StringBuffer();
@@ -132,7 +144,10 @@
}
// sb.append(updatelog+"\n\n\r");
// new UpdateDialog(activity).show();
- final UpdateDialog updateDialog = new UpdateDialog(activity);
+ if(updateDialog!=null&&updateDialog.isShowing()){
+ updateDialog.dismiss();
+ }
+ updateDialog = new UpdateDialog(activity);
updateDialog.setText(sb.toString(),newVerName);
updateDialog.setOnOtemListener(new UpdateDialog.UpdialogListener() {
--
Gitblit v1.9.3