From 54154f0e7f4d27212fb1d3fd18812f297bc5c02e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 26 三月 2026 10:00:35 +0800
Subject: [PATCH] 2026年03月26日10:00:18 加上界面脚本
---
app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 108 insertions(+), 4 deletions(-)
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 9049626..ecd7048 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
@@ -6,6 +6,7 @@
import com.facebook.imagepipeline.cache.BitmapMemoryCacheTrimStrategy;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -92,8 +93,13 @@
* @param isDelPath 鏄惁鍒犻櫎锛坱rue琛ㄧず鍒犻櫎锛屽惁鍒欎笉鍒犻櫎锛�
*/
public void getHdlESLocalJson(String fileName, String deviceType, String deviceModel, boolean isDelPath, CloudCallBeak<String> callBeak) {
+ // 2025骞�12鏈�08鏃�09:29:31 浜у搧缁忕悊璇达細鍥犺剼鏈繕娌℃湁閫傞厤闃挎媺浼瑷�锛屽厛榛樿鑻辨枃
+ String language = UserConfigManage.getInstance().getCurrentAppLanguage();
+// if (!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
+// language = Languages.en;
+// }
//鎷兼帴鍦板潃
- String url = getStrJointNewUrl(fileName, deviceType, deviceModel);
+ String url = getStrJointNewUrl(fileName, deviceType, deviceModel, language);
HttpClient.getInstance().requestJsonHttpGet(url, new CloudCallBeak<String>() {
@Override
public void onSuccess(String json) {
@@ -172,9 +178,10 @@
* @param fileName json鏂囦欢鍚嶇О
* @param deviceType 璁惧绫诲瀷锛坕nv锛宭c锛宐ms锛宐attery锛�
* @param deviceModel 璁惧鍨嬪彿
+ * @param language 璇█ 锛堜緥濡傦細Languages.zh)
* @return 鏂板湴鍧�
*/
- private String getStrJointNewUrl(String fileName, String deviceType, String deviceModel) {
+ private String getStrJointNewUrl(String fileName, String deviceType, String deviceModel, String language) {
String joinFileName = fileName + concatenation_symbol + deviceType + concatenation_symbol + deviceModel;
if (joinFileName.equals(FileName.hdl_inv_ecu_info_pv + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV)
|| joinFileName.equals(FileName.hdl_inv_ecu_info_output + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV)
@@ -195,10 +202,20 @@
|| 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)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_pv + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_output + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_signal + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_pv + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_output + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_signal + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8)
) {
- return address + "/" + UserConfigManage.getInstance().getCurrentAppLanguage() + "/" + deviceType + "/" + deviceModel + "/info/" + fileName + this.getVersion(joinFileName) + ".json";
+ return address + "/" + language + "/" + deviceType + "/" + deviceModel + "/info/" + fileName + this.getVersion(joinFileName) + ".json";
}
- return address + "/" + UserConfigManage.getInstance().getCurrentAppLanguage() + "/" + deviceType + "/" + deviceModel + "/" + fileName + this.getVersion(joinFileName) + ".json";
+ return address + "/" + language + "/" + deviceType + "/" + deviceModel + "/" + fileName + this.getVersion(joinFileName) + ".json";
}
//region ---------鏀逛竴鍔ㄤ簲锛堟敞鎰忥細濡傛灉鏄鍔犺澶囧瀷鍙枫�愯鍒癏dlFileLogic.createHdlESLocalJsonDirectory()鏂规硶閲岄潰鍒涘缓鏂囦欢澶广�戯級-----------
@@ -262,6 +279,37 @@
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璇︽儏
+
+
+ //绂荤綉閫嗗彉鍣� 6kw
+ map.put(FileName.hdl_inv_ecu_quick_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ map.put(FileName.hdl_inv_master_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄤ富鏈洪厤缃�
+ map.put(FileName.hdl_inv_slave_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄤ粠鏈洪厤缃�
+ map.put(FileName.hdl_inv_ecu_info_pv_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄨ鎯呭厜浼忚緭鍏�
+ map.put(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄨ鎯呬氦娴佽緭鍏�
+ map.put(FileName.hdl_inv_ecu_info_output_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄨ鎯呬氦娴佽緭鍑�
+ map.put(FileName.hdl_inv_ecu_info_item_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄨ鎯呭熀纭�鍙傛暟
+ map.put(FileName.hdl_inv_ecu_info_signal_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_6, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄨ鎯呯粺璁�
+ //bms
+ map.put(FileName.hdl_bms_ecu_off + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.OFF_INV_BMS_6, Version.v_2_0_0);//绂荤綉閫嗗彉鍣˙MS璇︽儏
+
+ //绂荤綉閫嗗彉鍣� 8kw
+ map.put(FileName.hdl_inv_ecu_quick_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ map.put(FileName.hdl_inv_master_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄤ富鏈洪厤缃�
+ map.put(FileName.hdl_inv_slave_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄤ粠鏈洪厤缃�
+ map.put(FileName.hdl_inv_ecu_info_pv_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄨ鎯呭厜浼忚緭鍏�
+ map.put(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄨ鎯呬氦娴佽緭鍏�
+ map.put(FileName.hdl_inv_ecu_info_output_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄨ鎯呬氦娴佽緭鍑�
+ map.put(FileName.hdl_inv_ecu_info_item_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄨ鎯呭熀纭�鍙傛暟
+ map.put(FileName.hdl_inv_ecu_info_signal_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_8, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄨ鎯呯粺璁�
+ //bms
+ map.put(FileName.hdl_bms_ecu_off + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.OFF_INV_BMS_8, Version.v_2_0_0);//绂荤綉閫嗗彉鍣˙MS璇︽儏
+
+ //BMS璁惧
+ map.put(FileName.bms_modbus_hdl_bms_ecu_v + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.ME_GLE_BW5K, Version.v_2_1_0);// 鍙傛暟璇︽儏椤甸潰锛圔MS璁惧锛�
+ map.put(FileName.bms_modbus_hdl_bms_ecu_config_v + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.ME_GLE_BW5K, Version.v_2_1_0);//鍙傛暟璁剧疆椤甸潰锛圔MS璁惧锛�
+ map.put(FileName.bms_modbus_hdl_bms_ecu_realtime_v + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.ME_GLE_BW5K, Version.v_2_1_0);//瀹炴椂椤甸潰锛圔MS璁惧锛�
+ map.put(FileName.bms_modbus_hdl_bms_ecu_signal_v + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.ME_GLE_BW5K, Version.v_2_1_0);//缁熻鐐归〉闈紙BMS璁惧锛�
return map;
}
@@ -289,6 +337,18 @@
list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_7);//绂荤嚎-閫嗗彉鍣�7.6kw
list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_7);//绂荤綉-閫嗗彉鍣�-BMS
list.add(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B15K_BATTERY);//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖�15k
+
+ //绂荤嚎-6kw閫嗗彉鍣�
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_6);//绂荤嚎-閫嗗彉鍣�6kw
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_6);//绂荤綉-閫嗗彉鍣�-BMS
+
+ // 绂荤嚎-8kw閫嗗彉鍣�
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_8);//绂荤嚎-閫嗗彉鍣�8kw
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_8);//绂荤綉-閫嗗彉鍣�-BMS
+
+ // BMS璁惧
+ list.add(HdlESLocalJsonLogic.DeviceModel.ME_GLE_BW5K);
+
return list;
}
@@ -401,6 +461,22 @@
*/
String hdl_battery_ecu_cell_off = "modbus_hdl_battery_ecu_cell_v";
+ /**
+ * 鍙傛暟璇︽儏椤甸潰锛圔MS璁惧锛�
+ */
+ String bms_modbus_hdl_bms_ecu_v = "modbus_hdl_bms_ecu_v";
+ /**
+ * 鍙傛暟璁剧疆椤甸潰锛圔MS璁惧锛�
+ */
+ String bms_modbus_hdl_bms_ecu_config_v = "modbus_hdl_bms_ecu_config_v";
+ /**
+ * 瀹炴椂椤甸潰锛圔MS璁惧锛�
+ */
+ String bms_modbus_hdl_bms_ecu_realtime_v = "modbus_hdl_bms_ecu_realtime_v";
+ /**
+ * 缁熻鐐归〉闈紙BMS璁惧锛�
+ */
+ String bms_modbus_hdl_bms_ecu_signal_v = "modbus_hdl_bms_ecu_signal_v";
/**
* 鑾峰彇閫嗗彉鍣ㄦ墍鏈塲son涓枃
@@ -410,6 +486,8 @@
* 鑾峰彇閫嗗彉鍣ㄦ墍鏈塲son鑻辨枃
*/
String hdl_inv_ecu_all_en = "/en/all_v";
+
+ String all_v = "all_v";
}
@@ -430,6 +508,7 @@
String v_1_5_7 = "1.5.7";
String v_1_5_8 = "1.5.8";
String v_2_0_0 = "2.0.0";
+ String v_2_1_0 = "2.1.0";
}
@@ -497,6 +576,31 @@
*/
String INV_KE_GLE_B15K_BATTERY = "ME-GLE-B15K";
+ /**
+ * 銆愮绾�-閫嗗彉鍣ㄣ�戣澶囧瀷鍙� 6kw
+ */
+ String OFF_INV_6 = "ME-GLE-S6K";
+
+ /**
+ * 銆愮缃�-閫嗗彉鍣�-BMS銆戣澶囧瀷鍙� 6kw
+ */
+ String OFF_INV_BMS_6 = "ME-GLE-S6K-BMS";
+
+ /**
+ * 銆愮绾�-閫嗗彉鍣ㄣ�戣澶囧瀷鍙� 8kw
+ */
+ String OFF_INV_8 = "ME-GLE-S8K";
+
+ /**
+ * 銆愮缃�-閫嗗彉鍣�-BMS銆戣澶囧瀷鍙� 8kw
+ */
+ String OFF_INV_BMS_8 = "ME-GLE-S8K-BMS";
+
+ /**
+ * 銆怋MS銆戣澶囧瀷鍙�
+ */
+ String ME_GLE_BW5K = "ME-GLE-BW5K";
+
}
--
Gitblit v1.8.0