From 14bcc4721b00afc9153865f57117a458f68cdf5d Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 19 五月 2025 20:40:49 +0800
Subject: [PATCH] 2025年05月19日20:40:47
---
app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java | 67 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 21 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 e2cb441..dee1ad5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
@@ -66,6 +66,11 @@
|| joinFileName.equals(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV)
|| joinFileName.equals(FileName.hdl_inv_ecu_info_signal + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV)
|| joinFileName.equals(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_pv + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_output + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3)
+ || 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)
) {
return address + "/" + UserConfigManage.getInstance().getCurrentAppLanguage() + "/" + deviceType + "/" + deviceModel + "/info/" + fileName + this.getVersion(joinFileName) + ".json";
}
@@ -97,9 +102,9 @@
Map<String, String> map = new HashMap<>();
//鎷兼帴瑙勫垯锛氭枃浠跺悕_璁惧绫诲瀷_璁惧淇″彿
map.put(FileName.hdl_lc_ecu_info_item + concatenation_symbol + DeviceType.LC + concatenation_symbol + DeviceModel.LC, Version.v_1_5_0);//鑾峰彇璐熻浇鎺у埗涓績
- map.put(FileName.hdl_lc_ecu_quick + concatenation_symbol + DeviceType.LC + concatenation_symbol + DeviceModel.LC, Version.v_1_5_0);//鍒涘缓鐢电珯-璐熻浇鎺у埗涓績鍙傛暟閰嶇疆
- map.put(FileName.hdl_inv_ecu_quick + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV, Version.v_1_5_2);//鍒涘缓鐢电珯-閫嗗彉鍣ㄥ弬鏁伴厤缃�
- map.put(FileName.hdl_inv_ecu + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV, Version.v_1_5_2);//閫嗗彉鍣ㄥ弬鏁伴厤缃�//鏇存柊鍒皏_1_5_2,鐩墠纭欢涓嶆敮鎸�
+ map.put(FileName.hdl_lc_ecu_quick + concatenation_symbol + DeviceType.LC + concatenation_symbol + DeviceModel.LC, Version.v_1_5_2);//鍒涘缓鐢电珯-璐熻浇鎺у埗涓績鍙傛暟閰嶇疆
+ map.put(FileName.hdl_inv_ecu_quick + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV, Version.v_1_5_1);//鍒涘缓鐢电珯-閫嗗彉鍣ㄥ弬鏁伴厤缃�
+ map.put(FileName.hdl_inv_ecu + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV, Version.v_1_5_3);//閫嗗彉鍣ㄥ弬鏁伴厤缃�//鏇存柊鍒皏_1_5_3,鐩墠纭欢涓嶆敮鎸�
map.put(FileName.hdl_inv_ecu_info_pv + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV, Version.v_1_4_2);// 閫嗗彉鍣ㄨ鎯�-pv
map.put(FileName.hdl_inv_ecu_info_output + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV, Version.v_1_4_2);//閫嗗彉鍣ㄨ鎯�-杈撳嚭
map.put(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV, Version.v_1_5_2);//閫嗗彉鍣ㄨ鎯�-item椤�//鏇存柊鍒皏_1_5_2锛岀洰鍓嶇‖浠朵笉鏀寔卢
@@ -107,18 +112,28 @@
map.put(FileName.hdl_bms_ecu + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.INV_BMS, Version.v_1_4_2);//鑾峰彇BMS淇℃伅
map.put(FileName.hdl_battery_ecu + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_BATTERY, Version.v_1_4_2);//鐢垫睜鍖呬俊鎭�
map.put(FileName.hdl_battery_ecu_cell + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_BATTERY, Version.v_1_4_2);//鐢垫睜鍖�-鐢佃姱淇℃伅
- //绂荤綉閫嗗彉鍣�
+ //绂荤綉閫嗗彉鍣� 5kw
map.put(FileName.hdl_inv_ecu_quick_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- map.put(FileName.hdl_inv_master_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- map.put(FileName.hdl_inv_slave_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- map.put(FileName.hdl_inv_ecu_info_pv_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- map.put(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- map.put(FileName.hdl_inv_ecu_info_output_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- map.put(FileName.hdl_inv_ecu_info_item_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- map.put(FileName.hdl_inv_ecu_info_signal_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- map.put(FileName.hdl_bms_ecu_off + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.OFF_INV_BMS, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ map.put(FileName.hdl_inv_master_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_4);//绂荤綉閫嗗彉鍣ㄤ富鏈洪厤缃�
+ map.put(FileName.hdl_inv_slave_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄤ粠鏈洪厤缃�
+ map.put(FileName.hdl_inv_ecu_info_pv_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄨ鎯呭厜浼忚緭鍏�
+ map.put(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄨ鎯呬氦娴佽緭鍏�
+ map.put(FileName.hdl_inv_ecu_info_output_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄨ鎯呬氦娴佽緭鍑�
+ map.put(FileName.hdl_inv_ecu_info_item_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_4);//绂荤綉閫嗗彉鍣ㄨ鎯呭熀纭�鍙傛暟
+ map.put(FileName.hdl_inv_ecu_info_signal_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄨ鎯呯粺璁�
+ map.put(FileName.hdl_bms_ecu_off + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.OFF_INV_BMS, Version.v_1_5_2);//绂荤綉閫嗗彉鍣˙MS璇︽儏
map.put(FileName.hdl_battery_ecu_off + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.OFF_INV_BATTERY, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
map.put(FileName.hdl_battery_ecu_cell_off + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.OFF_INV_BATTERY, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ //绂荤綉閫嗗彉鍣� 3.6kw
+ map.put(FileName.hdl_inv_ecu_quick_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_1_5_4);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ map.put(FileName.hdl_inv_master_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_1_5_4);//绂荤綉閫嗗彉鍣ㄤ富鏈洪厤缃�
+ map.put(FileName.hdl_inv_slave_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_1_5_4);//绂荤綉閫嗗彉鍣ㄤ粠鏈洪厤缃�
+ map.put(FileName.hdl_inv_ecu_info_pv_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_1_5_4);//绂荤綉閫嗗彉鍣ㄨ鎯呭厜浼忚緭鍏�
+ map.put(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_1_5_4);//绂荤綉閫嗗彉鍣ㄨ鎯呬氦娴佽緭鍏�
+ map.put(FileName.hdl_inv_ecu_info_output_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_1_5_4);//绂荤綉閫嗗彉鍣ㄨ鎯呬氦娴佽緭鍑�
+ map.put(FileName.hdl_inv_ecu_info_item_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_1_5_4);//绂荤綉閫嗗彉鍣ㄨ鎯呭熀纭�鍙傛暟
+ map.put(FileName.hdl_inv_ecu_info_signal_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_1_5_4);//绂荤綉閫嗗彉鍣ㄨ鎯呯粺璁�
+ map.put(FileName.hdl_bms_ecu_off + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.OFF_INV_BMS_3, Version.v_1_5_4);//绂荤綉閫嗗彉鍣˙MS璇︽儏
return map;
}
@@ -235,15 +250,11 @@
* Json鏁版嵁閰嶇疆鏂囦欢鍚�
*/
public @interface FileName {
-
/**
* 鍒涘缓鐢电珯-閫嗗彉鍣ㄥ弬鏁伴厤缃�
*/
String hdl_inv_ecu_quick = "modbus_hdl_inv_ecu_quick_v";
- /**
- * 鍒涘缓鐢电珯-璐熻浇鎺у埗涓績鍙傛暟閰嶇疆
- */
- String hdl_lc_ecu_quick = "modbus_hdl_lc_ecu_quick_v";
+
/**
* 閫嗗彉鍣ㄥ弬鏁伴厤缃紙config锛�
*/
@@ -260,6 +271,10 @@
* 閫嗗彉鍣ㄨ鎯�-item椤�
*/
String hdl_inv_ecu_info_item = "modbus_hdl_inv_ecu_info_item_v";
+ /**
+ * 鍒涘缓鐢电珯-璐熻浇鎺у埗涓績鍙傛暟閰嶇疆
+ */
+ String hdl_lc_ecu_quick = "modbus_hdl_lc_ecu_quick_v";
/**
* 鑾峰彇璐熻浇鎺у埗涓績
*/
@@ -361,6 +376,8 @@
String v_1_5_0 = "1.5.0";
String v_1_5_1 = "1.5.1";
String v_1_5_2 = "1.5.2";
+ String v_1_5_3 = "1.5.3";
+ String v_1_5_4 = "1.5.4";
}
@@ -387,18 +404,26 @@
/**
- * 銆愮绾块�嗗彉鍣ㄣ�戣澶囧瀷鍙�
+ * 銆愮绾�-閫嗗彉鍣ㄣ�戣澶囧瀷鍙� 5kw
*/
String OFF_INV = "ME-GLE-S5K";
-
/**
- * 銆愮缃戦�嗗彉鍣ㄨ櫄鎷烞MS銆戣澶囧瀷鍙�
+ * 銆愮缃�-閫嗗彉鍣�-铏氭嫙BMS銆戣澶囧瀷鍙�
*/
String OFF_INV_BMS = "ME-GLE-S5K-BMS";
/**
- * 銆愮缃戦�嗗彉鍣ㄧ數姹犲寘銆戣澶囧瀷鍙�
+ * 銆愮缃�-閫嗗彉鍣�-鐢垫睜鍖呫�戣澶囧瀷鍙�
*/
String OFF_INV_BATTERY = "ME-GLE-B5K";
+
+ /**
+ * 銆愮绾�-閫嗗彉鍣ㄣ�戣澶囧瀷鍙� 3.6kw
+ */
+ String OFF_INV_3 = "ME-GLE-S3.6K";
+ /**
+ * 銆愮缃�-閫嗗彉鍣�-铏氭嫙BMS銆戣澶囧瀷鍙� 3.6kw
+ */
+ String OFF_INV_BMS_3 = "ME-GLE-S3.6K-BMS";
}
/**
--
Gitblit v1.8.0