From 8dd82742af60bdc2d3c78db5d48fc0dbcb9ebf0c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 04 三月 2025 11:45:03 +0800
Subject: [PATCH] 2025年03月04日11:45:01
---
app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java | 115 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 65 insertions(+), 50 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 ebb0dd4..f510c1a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
@@ -42,6 +42,10 @@
*/
private static final String address = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu";
+ /**
+ * 鎷兼帴绗﹀彿
+ */
+ private final String concatenation_symbol = "%";
/**
* 鎷兼帴鏂板湴鍧�
@@ -52,7 +56,15 @@
* @return 鏂板湴鍧�
*/
private String getStrJointNewUrl(String fileName, String deviceType, String deviceModel) {
- return address + "/" + UserConfigManage.getInstance().getCurrentAppLanguage() + "/" + deviceType + "/" + deviceModel + "/" + fileName + this.getVersion(fileName) + ".json";
+ 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)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_signal + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV)
+ ) {
+ 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";
}
@@ -81,30 +93,31 @@
private List<String> getFileNameAndDeviceTypeAndDeviceModeList() {
//娉ㄦ剰锛堥�嗗彉鍣�:ME-GSE-S5K锛岃礋杞戒腑蹇�:ME-GSE-SPG63A锛宐ms:ME-GSE-BMS15K锛岀數姹犲寘:ME-GSE-B5K锛夎澶囧瀷鍙蜂笉涓�鏍�
//鎷兼帴瑙勫垯锛氭枃浠跺悕_璁惧绫诲瀷_璁惧淇″彿
+
List<String> stringList = new ArrayList<>();
- stringList.add(FileName.hdl_lc_ecu_info_item + "%" + DeviceType.LC + "%" + DeviceModel.LC);//鑾峰彇璐熻浇鎺у埗涓績
- stringList.add(FileName.hdl_lc_ecu_quick + "%" + DeviceType.LC + "%" + DeviceModel.LC);//鍒涘缓鐢电珯-璐熻浇鎺у埗涓績鍙傛暟閰嶇疆
- stringList.add(FileName.hdl_inv_ecu_quick + "%" + DeviceType.INV + "%" + DeviceModel.INV);//鍒涘缓鐢电珯-閫嗗彉鍣ㄥ弬鏁伴厤缃�
- stringList.add(FileName.hdl_inv_ecu + "%" + DeviceType.INV + "%" + DeviceModel.INV);//閫嗗彉鍣ㄥ弬鏁伴厤缃�
- stringList.add(FileName.hdl_inv_ecu_info_pv + "%" + DeviceType.INV + "%" + DeviceModel.INV);// 閫嗗彉鍣ㄨ鎯�-pv
- stringList.add(FileName.hdl_inv_ecu_info_output + "%" + DeviceType.INV + "%" + DeviceModel.INV);//閫嗗彉鍣ㄨ鎯�-杈撳嚭
- stringList.add(FileName.hdl_inv_ecu_info_item + "%" + DeviceType.INV + "%" + DeviceModel.INV);//閫嗗彉鍣ㄨ鎯�-item椤�
- stringList.add(FileName.hdl_inv_ecu_info_signal + "%" + DeviceType.INV + "%" + DeviceModel.INV);//閫嗗彉鍣ㄨ鎯�-淇″彿鐐�
- stringList.add(FileName.hdl_bms_ecu + "%" + DeviceType.BMS + "%" + DeviceModel.INV_BMS);//鑾峰彇BMS淇℃伅
- stringList.add(FileName.hdl_battery_ecu + "%" + DeviceType.BATTERY + "%" + DeviceModel.INV_BATTERY);//鐢垫睜鍖呬俊鎭�
- stringList.add(FileName.hdl_battery_ecu_cell + "%" + DeviceType.BATTERY + "%" + DeviceModel.INV_BATTERY);//鐢垫睜鍖�-鐢佃姱淇℃伅
+ stringList.add(FileName.hdl_lc_ecu_info_item + concatenation_symbol + DeviceType.LC + concatenation_symbol + DeviceModel.LC);//鑾峰彇璐熻浇鎺у埗涓績
+ stringList.add(FileName.hdl_lc_ecu_quick + concatenation_symbol + DeviceType.LC + concatenation_symbol + DeviceModel.LC);//鍒涘缓鐢电珯-璐熻浇鎺у埗涓績鍙傛暟閰嶇疆
+ stringList.add(FileName.hdl_inv_ecu_quick + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV);//鍒涘缓鐢电珯-閫嗗彉鍣ㄥ弬鏁伴厤缃�
+ stringList.add(FileName.hdl_inv_ecu + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV);//閫嗗彉鍣ㄥ弬鏁伴厤缃�
+ stringList.add(FileName.hdl_inv_ecu_info_pv + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV);// 閫嗗彉鍣ㄨ鎯�-pv
+ stringList.add(FileName.hdl_inv_ecu_info_output + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV);//閫嗗彉鍣ㄨ鎯�-杈撳嚭
+ stringList.add(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV);//閫嗗彉鍣ㄨ鎯�-item椤�
+ stringList.add(FileName.hdl_inv_ecu_info_signal + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV);//閫嗗彉鍣ㄨ鎯�-淇″彿鐐�
+ stringList.add(FileName.hdl_bms_ecu + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.INV_BMS);//鑾峰彇BMS淇℃伅
+ stringList.add(FileName.hdl_battery_ecu + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_BATTERY);//鐢垫睜鍖呬俊鎭�
+ stringList.add(FileName.hdl_battery_ecu_cell + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_BATTERY);//鐢垫睜鍖�-鐢佃姱淇℃伅
//绂荤綉閫嗗彉鍣�
- stringList.add(FileName.hdl_inv_ecu_quick_off + "%" + DeviceType.INV + "%" + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- stringList.add(FileName.hdl_inv_master_ecu_off + "%" + DeviceType.INV + "%" + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- stringList.add(FileName.hdl_inv_slave_ecu_off + "%" + DeviceType.INV + "%" + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- stringList.add(FileName.hdl_inv_ecu_info_pv_off + "%" + DeviceType.INV + "%" + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- stringList.add(FileName.hdl_inv_ecu_info_input_off + "%" + DeviceType.INV + "%" + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- stringList.add(FileName.hdl_inv_ecu_info_output_off + "%" + DeviceType.INV + "%" + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- stringList.add(FileName.hdl_inv_ecu_info_item_off + "%" + DeviceType.INV + "%" + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- stringList.add(FileName.hdl_inv_ecu_info_signal_off + "%" + DeviceType.INV + "%" + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- stringList.add(FileName.hdl_bms_ecu_off + "%" + DeviceType.BMS + "%" + DeviceModel.OFF_INV_BMS);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- stringList.add(FileName.hdl_bms_ecu_off + "%" + DeviceType.BATTERY + "%" + DeviceModel.OFF_INV_BATTERY);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
- stringList.add(FileName.hdl_battery_ecu_cell_off + "%" + DeviceType.BATTERY + "%" + DeviceModel.OFF_INV_BATTERY);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ stringList.add(FileName.hdl_inv_ecu_quick_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ stringList.add(FileName.hdl_inv_master_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ stringList.add(FileName.hdl_inv_slave_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ stringList.add(FileName.hdl_inv_ecu_info_pv_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ stringList.add(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ stringList.add(FileName.hdl_inv_ecu_info_output_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ stringList.add(FileName.hdl_inv_ecu_info_item_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ stringList.add(FileName.hdl_inv_ecu_info_signal_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ stringList.add(FileName.hdl_bms_ecu_off + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.OFF_INV_BMS);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ stringList.add(FileName.hdl_bms_ecu_off + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.OFF_INV_BATTERY);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ stringList.add(FileName.hdl_battery_ecu_cell_off + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.OFF_INV_BATTERY);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
return stringList;
}
@@ -114,30 +127,32 @@
* @return map
*/
private Map<String, String> getFeliAndVersion() {
+
Map<String, String> map = new HashMap<>();
- map.put(FileName.hdl_lc_ecu_info_item, Version.v_1_5_0);
- map.put(FileName.hdl_lc_ecu_quick, Version.v_1_5_0);
- map.put(FileName.hdl_inv_ecu_quick, Version.v_1_5_1);
- map.put(FileName.hdl_inv_ecu, Version.v_1_5_2);
- map.put(FileName.hdl_inv_ecu_info_pv, Version.v_1_4_2);
- map.put(FileName.hdl_inv_ecu_info_output, Version.v_1_4_2);
- map.put(FileName.hdl_inv_ecu_info_item, Version.v_1_5_2);
- map.put(FileName.hdl_inv_ecu_info_signal, Version.v_1_4_1);
- map.put(FileName.hdl_bms_ecu, Version.v_1_4_2);
- map.put(FileName.hdl_battery_ecu, Version.v_1_4_2);
- map.put(FileName.hdl_battery_ecu_cell, Version.v_1_4_2);
+ //鎷兼帴瑙勫垯锛氭枃浠跺悕_璁惧绫诲瀷_璁惧淇″彿
+ 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_1);
+ map.put(FileName.hdl_inv_ecu + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV, Version.v_1_5_1);//鏇存柊鍒皏_1_5_2,鐩墠纭欢涓嶆敮鎸�
+ map.put(FileName.hdl_inv_ecu_info_pv + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV, Version.v_1_4_2);
+ 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_1);//鏇存柊鍒皏_1_5_2锛岀洰鍓嶇‖浠朵笉鏀寔卢
+ map.put(FileName.hdl_inv_ecu_info_signal + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV, Version.v_1_4_1);
+ map.put(FileName.hdl_bms_ecu + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.INV_BMS, Version.v_1_4_2);
+ 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);
//绂荤綉閫嗗彉鍣�
- map.put(FileName.hdl_inv_ecu_quick_off, Version.v_1_5_2);
- map.put(FileName.hdl_inv_master_ecu_off, Version.v_1_5_2);
- map.put(FileName.hdl_inv_slave_ecu_off, Version.v_1_5_2);
- map.put(FileName.hdl_inv_ecu_info_pv_off, Version.v_1_5_2);
- map.put(FileName.hdl_inv_ecu_info_input_off, Version.v_1_5_2);
- map.put(FileName.hdl_inv_ecu_info_output_off, Version.v_1_5_2);
- map.put(FileName.hdl_inv_ecu_info_item_off, Version.v_1_5_2);
- map.put(FileName.hdl_inv_ecu_info_signal_off, Version.v_1_5_2);
- map.put(FileName.hdl_bms_ecu_off, Version.v_1_5_2);
- map.put(FileName.hdl_battery_ecu_off, Version.v_1_5_2);
- map.put(FileName.hdl_battery_ecu_cell_off, Version.v_1_5_2);
+ 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_bms_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);
return map;
}
@@ -146,7 +161,7 @@
*/
public void getAllHdlESLocalJson() {
for (String str : this.getFileNameAndDeviceTypeAndDeviceModeList()) {
- String[] ary = str.split("%");
+ String[] ary = str.split(concatenation_symbol);
String fileName = ary[0];
String deviceType = ary[1];
String deviceMode = ary[2];
@@ -263,15 +278,15 @@
/**
* 閫嗗彉鍣ㄨ鎯�-pv
*/
- String hdl_inv_ecu_info_pv = "info/modbus_hdl_inv_ecu_info_pv_v";
+ String hdl_inv_ecu_info_pv = "modbus_hdl_inv_ecu_info_pv_v";
/**
* 閫嗗彉鍣ㄨ鎯�-杈撳嚭
*/
- String hdl_inv_ecu_info_output = "info/modbus_hdl_inv_ecu_info_output_v";
+ String hdl_inv_ecu_info_output = "modbus_hdl_inv_ecu_info_output_v";
/**
* 閫嗗彉鍣ㄨ鎯�-item椤�
*/
- String hdl_inv_ecu_info_item = "info/modbus_hdl_inv_ecu_info_item_v";
+ String hdl_inv_ecu_info_item = "modbus_hdl_inv_ecu_info_item_v";
/**
* 鑾峰彇璐熻浇鎺у埗涓績
*/
@@ -293,7 +308,7 @@
/**
* 閫嗗彉鍣ㄨ鎯�-淇″彿鐐�
*/
- String hdl_inv_ecu_info_signal = "info/modbus_hdl_inv_ecu_info_signal_v";
+ String hdl_inv_ecu_info_signal = "modbus_hdl_inv_ecu_info_signal_v";
/**
--
Gitblit v1.8.0