From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/other/HdlAppUpdateLogic.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlAppUpdateLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlAppUpdateLogic.java
index f33d32e..ece4a65 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAppUpdateLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAppUpdateLogic.java
@@ -7,6 +7,9 @@
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.bean.NewVersionBean;
+import com.hdl.photovoltaic.HDLApp;
+import com.hdl.photovoltaic.config.AppConfigManage;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -19,11 +22,14 @@
*/
public class HdlAppUpdateLogic {
- public static final String ApkFileName = "hdl_photovoltaic.apk";
/**
- * 鍦╥ot骞冲彴鍒涘缓鏂癮pp鏃惰嚜鍔ㄧ敓鎴愮殑
+ * 鍦╥ot骞冲彴鍒涘缓鏂癮pp鏃惰嚜鍔ㄧ敓鎴愮殑锛堟祴璇曠幆澧冿級
*/
- private final String appCode = "1728976668552863746";
+ private final String appCodeTest = "1728976668552863746";
+ /**
+ * 鍦╥ot骞冲彴鍒涘缓鏂癮pp鏃惰嚜鍔ㄧ敓鎴愮殑锛堟寮忕幆澧冿級
+ */
+ private final String appCodeRelease = "1763139117625831426";
private static volatile HdlAppUpdateLogic sHdlAppUpdateLogic;
/**
@@ -44,6 +50,13 @@
}
/**
+ * @return 杩斿洖鍖呭悕
+ */
+ public String getApkFileName() {
+ return HDLApp.getInstance().getPackageName() + ".apk";
+ }
+
+ /**
* app鐗堟湰妫�娴嬫洿鏂�
* 鏀寔Android銆乮OS銆亀gt妫�娴�
*
@@ -52,7 +65,11 @@
*/
public void checkAppVersion(String version, CloudCallBeak<NewVersionBean> cloudCallBeak) {
JsonObject json = new JsonObject();
- json.addProperty("appCode", appCode);
+ if (AppConfigManage.getOnlineServer()) {
+ json.addProperty("appCode", appCodeRelease);
+ } else {
+ json.addProperty("appCode", appCodeTest);
+ }
json.addProperty("version", version);
json.addProperty("releaseSystem", "Android");//鍙戝竷绯荤粺锛孖OS銆丄ndroid, wgt
String requestUrl = HttpApi.POST_APP_VERSION_CHECK;
--
Gitblit v1.8.0