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 | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 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 fa148c0..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
@@ -16,7 +16,6 @@
import com.doumee.keyCabinet.http.param.BaseResponse;
import com.doumee.keyCabinet.http.param.DevAppVersionParam;
import com.doumee.keyCabinet.http.param.RequestBaseObject;
-import com.doumee.keyCabinet.utils.ParamsUtil;
public class UpdateUtil {
public static String newVerName = "";
@@ -58,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);
}
@@ -70,29 +80,23 @@
}
private void getUpgradeInfo() {
- if (true) {
- return;
- }
- RequestBaseObject<DevAppVersionParam> request = new RequestBaseObject<>();
- DevAppVersionParam param = new DevAppVersionParam();
- param.setVersionCode(BuildConfig.VERSION_CODE);
- param.setType("2");
- request.setParam(param);
- activity.getVM().getRetrofitService(Apis.class).getVersion(MApplication.getConfigBean().getLanguage(),MApplication.getCookie(),MApplication.getConfigBean().getShopId(),
- MApplication.getConfigBean().getGymId(), ParamsUtil.encodeRequestBody(request))
+ activity.getVM().getRetrofitService(Apis.class).getVersion()
.compose(RxUtils.schedulersTransformer())
.subscribe(new SimpleObserver<BaseResponse<AndroidVersionBean>>(activity.getVM().rxJavaGcManager) {
@Override
public void onNext(@NonNull BaseResponse<AndroidVersionBean> response) {
- if ("000000".equals(response.getErrorCode())) {
- if (response.getRecord()!=null) {
- versionCallBack.isNeedUpdate(true);
- AndroidVersionBean data = response.getRecord();
- upgradeurl=data.getUpdateUrl();
- updatelog=data.getUpdateContent();
- newVerName = response.getRecord().getVersionName();
- doNewVersionUpdate(true);
- return;
+ if (200==response.getCode()) {
+ if (response.getData()!=null) {
+ AndroidVersionBean data = response.getData();
+ if(data!=null&&data.getVersionNum()!=null&&data.getVersionNum()>BuildConfig.VERSION_CODE){
+ versionCallBack.isNeedUpdate(true);
+ upgradeurl=data.getFullFileUrl();
+ updatelog=data.getContent();
+ newVerName = data.getVersionInfo();
+ doNewVersionUpdate(data.getIsForce()==1);
+ }else {
+ versionCallBack.isNeedUpdate(false);
+ }
}else {
versionCallBack.isNeedUpdate(false);
}
@@ -124,6 +128,7 @@
}
}
+ private UpdateDialog updateDialog;
// 鏇存柊鏂扮増鏈�
public void doNewVersionUpdate(boolean type) {
StringBuffer sb = new StringBuffer();
@@ -139,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