From 1dd74507e6e80abf235c1ea6c33bdda0987510af Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 12 五月 2025 11:36:31 +0800
Subject: [PATCH] 2025年05月12日11:36:28
---
app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 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 7ffd5bc..1d2e4f7 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";
}
@@ -107,18 +112,29 @@
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_3);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ 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_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);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
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_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ 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_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ map.put(FileName.hdl_inv_ecu_info_pv_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ map.put(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ map.put(FileName.hdl_inv_ecu_info_output_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ 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_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ map.put(FileName.hdl_bms_ecu_off + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.OFF_INV_BMS_3, Version.v_1_5_2);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
return map;
}
@@ -362,6 +378,7 @@
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";
}
@@ -388,18 +405,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