From 94ed29870324b00c3881e517ffee15903133f79b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 11 七月 2025 15:16:14 +0800
Subject: [PATCH] 2025年07月11日15:16:13
---
app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java | 12 +++++
app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java | 37 ++++++++++++++++++
app/src/main/assets/data/dcloud_control.xml | 2
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 8 ++--
5 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/app/src/main/assets/data/dcloud_control.xml b/app/src/main/assets/data/dcloud_control.xml
index ab101e5..7ccb586 100644
--- a/app/src/main/assets/data/dcloud_control.xml
+++ b/app/src/main/assets/data/dcloud_control.xml
@@ -1,4 +1,4 @@
-<hbuilder debug="false" syncDebug="false" version="1.9.9.80110">
+<hbuilder debug="true" syncDebug="true" version="1.9.9.80110">
<apps>
<app appid="unimp" appver="1.0" />
</apps>
diff --git a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
index 81c9c0b..9475fa3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -62,7 +62,7 @@
//鏄惁鏄疊绔处鍙风櫥褰�(true=B绔�)
private boolean isB_account;
//鏄惁姝ｅ紡鏈嶅姟鍣�(true锛氭寮忥紝false锛氭祴璇�)
- private boolean isOnlineServer = false;
+ private boolean isOnlineServer = true;
public boolean isOnlineServer() {
return isOnlineServer;
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
index 11789ee..66924f4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
@@ -3,6 +3,7 @@
import android.os.Build;
import android.text.TextUtils;
+import com.facebook.imagepipeline.cache.BitmapMemoryCacheTrimStrategy;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
@@ -197,6 +198,11 @@
|| joinFileName.equals(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3)
|| joinFileName.equals(FileName.hdl_inv_ecu_info_signal + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3)
|| joinFileName.equals(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_pv + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_output + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_signal + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7)
) {
return address + "/" + UserConfigManage.getInstance().getCurrentAppLanguage() + "/" + deviceType + "/" + deviceModel + "/info/" + fileName + this.getVersion(joinFileName) + ".json";
}
@@ -248,6 +254,21 @@
//鐢垫睜鍖呰浆鎹㈠櫒
map.put(FileName.hdl_battery_ecu + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_KE_GLE_B5K_BATTERY, Version.v_1_5_5);//鐢垫睜鍖呬俊鎭�
map.put(FileName.hdl_battery_ecu_cell + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_KE_GLE_B5K_BATTERY, Version.v_1_5_5);//鐢垫睜鍖�-鐢佃姱淇℃伅
+
+ //绂荤綉閫嗗彉鍣� 7.6kw
+ map.put(FileName.hdl_inv_ecu_quick_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ map.put(FileName.hdl_inv_master_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄤ富鏈洪厤缃�
+ map.put(FileName.hdl_inv_slave_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄤ粠鏈洪厤缃�
+ map.put(FileName.hdl_inv_ecu_info_pv_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄨ鎯呭厜浼忚緭鍏�
+ map.put(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄨ鎯呬氦娴佽緭鍏�
+ map.put(FileName.hdl_inv_ecu_info_output_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄨ鎯呬氦娴佽緭鍑�
+ map.put(FileName.hdl_inv_ecu_info_item_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄨ鎯呭熀纭�鍙傛暟
+ map.put(FileName.hdl_inv_ecu_info_signal_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄨ鎯呯粺璁�
+ //鐢垫睜鍖�15k
+ map.put(FileName.hdl_battery_ecu + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_KE_GLE_B15K_BATTERY, Version.v_1_5_7);//鐢垫睜鍖呬俊鎭�
+ map.put(FileName.hdl_battery_ecu_cell + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_KE_GLE_B15K_BATTERY, Version.v_1_5_7);//鐢垫睜鍖�-鐢佃姱淇℃伅
+ //bms
+ map.put(FileName.hdl_bms_ecu_off + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.OFF_INV_BMS_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣˙MS璇︽儏
return map;
}
@@ -385,6 +406,7 @@
String v_1_5_4 = "1.5.4";
String v_1_5_5 = "1.5.5";
String v_1_5_6 = "1.5.6";
+ String v_1_5_7 = "1.5.7";
}
@@ -437,6 +459,21 @@
*/
String INV_KE_GLE_B5K_BATTERY = "KE-GLE-B5K";
+ /**
+ * 銆愮绾�-閫嗗彉鍣ㄣ�戣澶囧瀷鍙� 7.6kw
+ */
+ String OFF_INV_7 = "ME-GLE-S7.6K";
+
+ /**
+ * 銆愮缃�-閫嗗彉鍣�-BMS銆戣澶囧瀷鍙� 7.6kw
+ */
+ String OFF_INV_BMS_7 = "ME-GLE-S7.6K-BMS";
+
+ /**
+ * 銆愮數姹犲寘15k銆戣澶囧瀷鍙�
+ */
+ String INV_KE_GLE_B15K_BATTERY = "ME-GLE-B15K";
+
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
index 463e94b..78a58e3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
@@ -212,10 +212,16 @@
this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BATTERY));//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖�
//绂荤嚎-3.6kw閫嗗彉鍣�
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_3));//绂荤嚎-閫嗗彉鍣�
+ this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_3));//绂荤嚎-閫嗗彉鍣�3.6kw
this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_3));//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS
//鐢垫睜鍖呰浆鎹㈠櫒
this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B5K_BATTERY));//鐢垫睜鍖呰浆鎹㈠櫒
+
+ //绂荤嚎-7.6kw閫嗗彉鍣�
+ this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_7));//绂荤嚎-閫嗗彉鍣�7.6kw
+ this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_7));//绂荤綉-閫嗗彉鍣�-BMS
+ this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B15K_BATTERY));//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖�15k
+
//鑻辨枃鏂囦欢澶�
@@ -235,6 +241,10 @@
//鐢垫睜鍖呰浆鎹㈠櫒
this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B5K_BATTERY));//鐢垫睜鍖呰浆鎹㈠櫒
+ //绂荤嚎-7.6kw閫嗗彉鍣�
+ this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_7));//绂荤嚎-閫嗗彉鍣�7.6kw
+ this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_7));//绂荤綉-閫嗗彉鍣�-BMS
+ this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B15K_BATTERY));//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖�15k
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index e221983..36530ca 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -775,10 +775,10 @@
} else if (s.startsWith("[")) {
uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
} else {
- uniSuccessCallback(type, s, callback);
+ uniSuccessCallback(type, new JsonArray(), callback);
}
} catch (Exception e) {
- uniSuccessCallback(type, s, callback);
+ uniSuccessCallback(type, new JsonArray(), callback);
}
}
}
@@ -799,10 +799,10 @@
} else if (json.startsWith("[")) {
uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
} else {
- uniSuccessCallback(type, json, callback);
+ uniSuccessCallback(type, new JsonArray(), callback);
}
} catch (Exception e) {
- uniSuccessCallback(type, json, callback);
+ uniSuccessCallback(type, new JsonArray(), callback);
}
long endTime = System.currentTimeMillis() - startTime;
Log.d("====鑰楁椂鏃堕棿====", String.valueOf(endTime));
--
Gitblit v1.8.0