From 4db3692de0001eea35f938c1224181746e72933a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 27 十一月 2025 21:30:07 +0800
Subject: [PATCH] 支持创建阿拉伯语言的脚本文件夹
---
app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java | 96 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 78 insertions(+), 18 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 11789ee..9049626 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
@@ -3,6 +3,7 @@
import android.os.Build;
import android.text.TextUtils;
+import com.facebook.imagepipeline.cache.BitmapMemoryCacheTrimStrategy;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
@@ -136,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);
}
@@ -161,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 "";
@@ -197,12 +190,18 @@
|| 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)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_pv + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_output + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7)
+ || 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)
) {
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()鏂规硶閲岄潰鍒涘缓鏂囦欢澶广�戯級-----------
+
/**
* 鏂囦欢瀵瑰簲鐗堟湰鍙�
@@ -215,40 +214,83 @@
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_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 + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV, Version.v_1_5_8);//閫嗗彉鍣ㄥ弬鏁伴厤缃�
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锛岀洰鍓嶇‖浠朵笉鏀寔卢
+ map.put(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV, Version.v_1_5_8);//閫嗗彉鍣ㄨ鎯�-item椤�
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);//鑾峰彇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_6);//绂荤綉閫嗗彉鍣ㄤ富鏈洪厤缃�
+ map.put(FileName.hdl_inv_master_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄤ富鏈洪厤缃�
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_item_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV, Version.v_1_5_8);//绂荤綉閫嗗彉鍣ㄨ鎯呭熀纭�鍙傛暟
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_6);//绂荤綉閫嗗彉鍣˙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_6);//绂荤綉閫嗗彉鍣ㄤ富鏈洪厤缃�
+ map.put(FileName.hdl_inv_master_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄤ富鏈洪厤缃�
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_item_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3, Version.v_1_5_8);//绂荤綉閫嗗彉鍣ㄨ鎯呭熀纭�鍙傛暟
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_6);//绂荤綉閫嗗彉鍣˙MS璇︽儏
//鐢垫睜鍖呰浆鎹㈠櫒
map.put(FileName.hdl_battery_ecu + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_KE_GLE_B5K_BATTERY, Version.v_1_5_5);//鐢垫睜鍖呬俊鎭�
map.put(FileName.hdl_battery_ecu_cell + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_KE_GLE_B5K_BATTERY, Version.v_1_5_5);//鐢垫睜鍖�-鐢佃姱淇℃伅
+
+ //绂荤綉閫嗗彉鍣� 7.6kw
+ map.put(FileName.hdl_inv_ecu_quick_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄥ揩閫熼厤缃�
+ map.put(FileName.hdl_inv_master_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_2_0_0);//绂荤綉閫嗗彉鍣ㄤ富鏈洪厤缃�
+ map.put(FileName.hdl_inv_slave_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄤ粠鏈洪厤缃�
+ map.put(FileName.hdl_inv_ecu_info_pv_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄨ鎯呭厜浼忚緭鍏�
+ map.put(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄨ鎯呬氦娴佽緭鍏�
+ map.put(FileName.hdl_inv_ecu_info_output_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄨ鎯呬氦娴佽緭鍑�
+ map.put(FileName.hdl_inv_ecu_info_item_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_8);//绂荤綉閫嗗彉鍣ㄨ鎯呭熀纭�鍙傛暟
+ map.put(FileName.hdl_inv_ecu_info_signal_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//绂荤綉閫嗗彉鍣ㄨ鎯呯粺璁�
+ //鐢垫睜鍖�15k
+ map.put(FileName.hdl_battery_ecu + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_KE_GLE_B15K_BATTERY, Version.v_1_5_7);//鐢垫睜鍖呬俊鎭�
+ 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璇︽儏
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
+ return list;
+
}
/**
@@ -385,6 +427,9 @@
String v_1_5_4 = "1.5.4";
String v_1_5_5 = "1.5.5";
String v_1_5_6 = "1.5.6";
+ String v_1_5_7 = "1.5.7";
+ String v_1_5_8 = "1.5.8";
+ String v_2_0_0 = "2.0.0";
}
@@ -437,6 +482,21 @@
*/
String INV_KE_GLE_B5K_BATTERY = "KE-GLE-B5K";
+ /**
+ * 銆愮绾�-閫嗗彉鍣ㄣ�戣澶囧瀷鍙� 7.6kw
+ */
+ String OFF_INV_7 = "ME-GLE-S7.6K";
+
+ /**
+ * 銆愮缃�-閫嗗彉鍣�-BMS銆戣澶囧瀷鍙� 7.6kw
+ */
+ String OFF_INV_BMS_7 = "ME-GLE-S7.6K-BMS";
+
+ /**
+ * 銆愮數姹犲寘15k銆戣澶囧瀷鍙�
+ */
+ String INV_KE_GLE_B15K_BATTERY = "ME-GLE-B15K";
+
}
--
Gitblit v1.8.0