From 29ca25fb0843b575f4367290d5cd0d649b51019c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 04 十二月 2025 15:11:47 +0800
Subject: [PATCH] 支持离线6kw逆变器和离线8kw逆变器配置文件
---
app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 97 insertions(+), 12 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 8ec6c1f..639a128 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
@@ -137,12 +137,8 @@
if (TextUtils.isEmpty(json)) {
return;
}
- //鑻辨枃鏂囦欢璺緞
- String fullPath = HdlFileLogic.getInstance().getHdlESLocalJsonEnFilePath(deviceModel, fileName);
- if (UserConfigManage.getInstance().isZh()) {
- //涓枃鏂囦欢璺緞
- fullPath = HdlFileLogic.getInstance().getHdlESLocalJsonZhFilePath(deviceModel, fileName);
- }
+ //鏂囦欢璺緞
+ String fullPath = HdlFileLogic.getInstance().getHdlESLocalLanguageJsonFilePath(UserConfigManage.getInstance().getCurrentAppLanguage(), deviceModel, fileName);
if (isDelPath) {
HdlFileLogic.getInstance().deleteFile(fullPath);
}
@@ -162,12 +158,8 @@
if (TextUtils.isEmpty(fileName)) {
return "";
}
- //鑻辨枃鏂囦欢璺緞
- String fullPath = HdlFileLogic.getInstance().getHdlESLocalJsonEnFilePath(deviceModel, fileName);
- if (UserConfigManage.getInstance().isZh()) {
- //涓枃鏂囦欢璺緞
- fullPath = HdlFileLogic.getInstance().getHdlESLocalJsonZhFilePath(deviceModel, fileName);
- }
+ //鏂囦欢璺緞
+ String fullPath = HdlFileLogic.getInstance().getHdlESLocalLanguageJsonFilePath(UserConfigManage.getInstance().getCurrentAppLanguage(), deviceModel, fileName);
return HdlFileLogic.getInstance().readFile(fullPath);
} catch (Exception ignored) {
return "";
@@ -203,12 +195,23 @@
|| 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 + "/" + UserConfigManage.getInstance().getCurrentAppLanguage() + "/" + deviceType + "/" + deviceModel + "/" + fileName + this.getVersion(joinFileName) + ".json";
}
//region ---------鏀逛竴鍔ㄤ簲锛堟敞鎰忥細濡傛灉鏄鍔犺澶囧瀷鍙枫�愯鍒癏dlFileLogic.createHdlESLocalJsonDirectory()鏂规硶閲岄潰鍒涘缓鏂囦欢澶广�戯級-----------
+
/**
* 鏂囦欢瀵瑰簲鐗堟湰鍙�
@@ -269,7 +272,69 @@
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璇︽儏
return map;
+ }
+
+ /**
+ * 鑾峰彇璁惧鍨嬪彿鍒楄〃
+ *
+ * @return 璁惧鍨嬪彿鍒楄〃
+ */
+ public List<String> getModelList() {
+ ArrayList<String> list = new ArrayList<>();
+ list.add(DeviceModel.INV);//骞剁綉-閫嗗彉鍣�
+ list.add(HdlESLocalJsonLogic.DeviceModel.LC);//璐熻浇涓績
+ list.add(HdlESLocalJsonLogic.DeviceModel.INV_BMS);//BMS
+ list.add(HdlESLocalJsonLogic.DeviceModel.INV_BATTERY);//鐢垫睜鍖�
+ //绂荤嚎-閫嗗彉鍣�
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV);//绂荤嚎-閫嗗彉鍣�
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS);//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BATTERY);//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖�
+ //绂荤嚎-3.6kw閫嗗彉鍣�
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_3);//绂荤嚎-閫嗗彉鍣�3.6kw
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_3);//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS
+ //鐢垫睜鍖呰浆鎹㈠櫒
+ list.add(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B5K_BATTERY);//鐢垫睜鍖呰浆鎹㈠櫒
+ //绂荤嚎-7.6kw閫嗗彉鍣�
+ 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
+
+ return list;
+
}
/**
@@ -476,6 +541,26 @@
*/
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";
+
}
--
Gitblit v1.8.0