From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 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 6dfdad7..4309e4d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
@@ -97,8 +97,8 @@
         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_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_2);//閫嗗彉鍣ㄥ弬鏁伴厤缃�//鏇存柊鍒皏_1_5_2,鐩墠纭欢涓嶆敮鎸�
         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);//閫嗗彉鍣ㄨ鎯�-杈撳嚭
@@ -134,7 +134,7 @@
             String fileName = ary[0];
             String deviceType = ary[1];
             String deviceMode = ary[2];
-            this.getHdlESLocalJson(fileName, deviceType, deviceMode, null);
+            this.getHdlESLocalJson(fileName, deviceType, deviceMode, true, null);
         }
 
     }
@@ -146,14 +146,15 @@
      * @param fileName    鏂囦欢鍚�
      * @param deviceType  璁惧绫诲瀷
      * @param deviceModel 璁惧鍨嬪彿
+     * @param isDelPath   鏄惁鍒犻櫎锛坱rue琛ㄧず鍒犻櫎锛屽惁鍒欎笉鍒犻櫎锛�
      */
-    public void getHdlESLocalJson(String fileName, String deviceType, String deviceModel, CloudCallBeak<String> callBeak) {
+    public void getHdlESLocalJson(String fileName, String deviceType, String deviceModel, boolean isDelPath, CloudCallBeak<String> callBeak) {
         //鎷兼帴鍦板潃
         String url = getStrJointNewUrl(fileName, deviceType, deviceModel);
         HttpClient.getInstance().requestJsonHttpGet(url, new CloudCallBeak<String>() {
             @Override
             public void onSuccess(String json) {
-                saveJson(fileName, deviceModel, json);
+                saveJson(fileName, deviceModel, json, isDelPath);
                 HdlLogLogic.print("鑾峰彇浜戠鑴氭湰---" + url + "\r\n" + json, false);
                 if (callBeak != null) {
                     callBeak.onSuccess(json);
@@ -185,9 +186,10 @@
      *
      * @param fileName    鏂囦欢鍚�
      * @param deviceModel 璁惧鍨嬪彿锛堥�嗗彉鍣紝璐熻浇涓績锛宐ms锛岀數姹犲寘锛�
-     * @param json        鍐呭
+     * @param json        json鍐呭
+     * @param isDelPath   鏄惁鍒犻櫎锛坱rue琛ㄧず鍒犻櫎锛屽惁鍒欎笉鍒犻櫎锛�
      */
-    private void saveJson(String fileName, String deviceModel, String json) {
+    private void saveJson(String fileName, String deviceModel, String json, boolean isDelPath) {
         try {
             if (TextUtils.isEmpty(json)) {
                 return;
@@ -198,7 +200,9 @@
                 //涓枃鏂囦欢璺緞
                 fullPath = HdlFileLogic.getInstance().getHdlESLocalJsonZhFilePath(deviceModel, fileName);
             }
-
+            if (isDelPath) {
+                HdlFileLogic.getInstance().deleteFile(fullPath);
+            }
             HdlFileLogic.getInstance().writeFile(fullPath, json);
         } catch (Exception ignored) {
         }
@@ -231,15 +235,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锛�
          */
@@ -257,6 +257,10 @@
          */
         String hdl_inv_ecu_info_item = "modbus_hdl_inv_ecu_info_item_v";
         /**
+         * 鍒涘缓鐢电珯-璐熻浇鎺у埗涓績鍙傛暟閰嶇疆
+         */
+        String hdl_lc_ecu_quick = "modbus_hdl_lc_ecu_quick_v";
+        /**
          * 鑾峰彇璐熻浇鎺у埗涓績
          */
         String hdl_lc_ecu_info_item = "modbus_hdl_lc_ecu_info_item_v";

--
Gitblit v1.8.0