From 80f2ca2df62ff1cd03046864af504245be078eb2 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 05 六月 2025 10:37:28 +0800 Subject: [PATCH] 2025年06月05日10:37:26 --- app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 101 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java index cb44355..463e94b 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java @@ -8,7 +8,9 @@ import android.text.TextUtils; import com.hdl.photovoltaic.HDLApp; +import com.hdl.photovoltaic.config.ConstantManage; import com.hdl.photovoltaic.config.UserConfigManage; +import com.hdl.photovoltaic.utils.LocalManageUtil; import org.apache.commons.io.FileUtils; @@ -100,11 +102,31 @@ } /** + * 鑾峰彇涓枃銆恓son璧勬簮鏂囦欢澶广�戝叏璺緞 + * + * @param deviceModel 璁惧鍨嬪彿 + */ + public String getHdlESLocalJsonZhRootPath(String deviceModel) { + return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + LocalManageUtil.zh + "/" + deviceModel; + } + + /** + * 鑾峰彇鑻辨枃銆恓son璧勬簮鏂囦欢澶广�戝叏璺緞 + * + * @param deviceModel 璁惧鍨嬪彿 + */ + public String getHdlESLocalJsonEnRootPath(String deviceModel) { + return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + LocalManageUtil.en + "/" + deviceModel; + } + + + /** * 鑾峰彇銆愭棩蹇楁枃浠躲�戝叏璺緞 */ public String getLogFileNamePath() { return getCurrentHomeRootPath() + "/log.txt"; } + /** * 鑾峰彇銆愮敤鎴锋枃浠躲�戝叏璺緞 @@ -112,6 +134,27 @@ public String getUserFilePath() { return getAPPInternalStoreFilesPath() + "/userConfigManage.txt"; } + + /** + * 鑾峰彇涓枃銆恓son璧勬簮鏂囦欢銆戝叏璺緞 + */ + public String getHdlESLocalJsonZhFilePath(String deviceModel, String fileName) { + if (!fileName.endsWith(".json")) { + fileName += ".json"; + } + return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + LocalManageUtil.zh + "/" + deviceModel + "/" + fileName; + } + + /** + * 鑾峰彇鑻辨枃銆恓son璧勬簮鏂囦欢銆戝叏璺緞 + */ + public String getHdlESLocalJsonEnFilePath(String deviceModel, String fileName) { + if (!fileName.endsWith(".json")) { + fileName += ".json"; + } + return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + LocalManageUtil.en + "/" + deviceModel + "/" + fileName; + } + /** * 鑾峰彇椹卞姩鍗囩骇鏂囦欢鍏ㄨ矾寰� @@ -128,13 +171,12 @@ /** * 鑾峰彇鍥轰欢鍗囩骇鏂囦欢鍏ㄨ矾寰� * - * @param oid 璇ュ浐浠秓id * @param imageId 闀滃儚id * @param version 椹卞姩鐗堟湰 * @return 鍏ㄨ矾寰� */ - public String getFirmwarePathFileName(String oid, String imageId, String version) { - String fileName = oid + "_" + imageId + "_" + version + ".zip"; + public String getFirmwarePathFileName(String imageId, String version) { + String fileName = imageId + "_" + version + ".zip"; return HdlFileLogic.getInstance().getFirmwareRootPath() + "/" + fileName; } @@ -152,6 +194,46 @@ this.createFileDir(this.getDriveRootPath()); //鍥轰欢鏂囦欢 this.createFileDir(this.getFirmwareRootPath()); + } + + /** + * 棰勫垱寤簀son璧勬簮鏂囦欢澶� + */ + public void createHdlESLocalJsonDirectory() { + //涓枃鏂囦欢澶� + //骞剁綉-閫嗗彉鍣� + this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV));//骞剁綉-閫嗗彉鍣� + this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.LC));//璐熻浇涓績 + this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_BMS));//BMS + this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_BATTERY));//鐢垫睜鍖� + //绂荤嚎-閫嗗彉鍣� + this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV));//绂荤嚎-閫嗗彉鍣� + this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS));//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS + this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BATTERY));//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖� + + //绂荤嚎-3.6kw閫嗗彉鍣� + this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_3));//绂荤嚎-閫嗗彉鍣� + this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_3));//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS + //鐢垫睜鍖呰浆鎹㈠櫒 + this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B5K_BATTERY));//鐢垫睜鍖呰浆鎹㈠櫒 + + + //鑻辨枃鏂囦欢澶� + this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV)); + this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.LC)); + this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_BMS)); + this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_BATTERY)); + //绂荤嚎閫嗗彉鍣� + this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV));//绂荤嚎-閫嗗彉鍣� + this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS));//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS + this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BATTERY));//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖� + + //绂荤嚎-3.6kw閫嗗彉鍣� + this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_3));//绂荤嚎-閫嗗彉鍣� + this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_3));//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS + + //鐢垫睜鍖呰浆鎹㈠櫒 + this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B5K_BATTERY));//鐢垫睜鍖呰浆鎹㈠櫒 } @@ -166,7 +248,7 @@ File file = new File(fullPath); if (!file.isDirectory()) { boolean succeed = file.mkdirs(); - System.out.println("鍒涘缓鏂囦欢澶硅矾寰�--->" + file.getAbsolutePath() + "===鍒涘缓鏂囦欢澶圭粨鏋�--->" + succeed); + System.out.println("鍒涘缓鏂囦欢澶硅矾寰�---" + file.getAbsolutePath() + "===鍒涘缓鏂囦欢澶圭粨鏋�---" + succeed); return succeed; } return true; @@ -199,7 +281,7 @@ } // 鍒犻櫎鏂囦欢澶规湰韬� boolean succeed = fileRoot.delete();//鏂囦欢澶圭┖杩欎釜鏂规硶鎵嶆湁鏁� - System.out.println("鍒犻櫎鏂囦欢澶硅矾寰�--->" + fileRoot.getAbsolutePath() + "===鍒犻櫎缁撴灉--->" + succeed); + System.out.println("鍒犻櫎鏂囦欢澶硅矾寰�---" + fileRoot.getAbsolutePath() + "===鍒犻櫎缁撴灉---" + succeed); } catch (Exception e) { System.out.println("鍒犻櫎鏂囦欢澶规湁寮傚父===" + e.getMessage()); } @@ -222,7 +304,7 @@ File file = new File(fullPath); if (!file.exists()) { boolean succeed = file.createNewFile(); - System.out.println("鍒涘缓鏂囦欢璺緞--->" + file.getAbsolutePath() + "===鍒涘缓鏂囦欢缁撴灉--->" + succeed); + System.out.println("鍒涘缓鏂囦欢璺緞---" + file.getAbsolutePath() + "===鍒涘缓鏂囦欢缁撴灉---" + succeed); return succeed; } return true; @@ -243,7 +325,7 @@ File file = new File(fullPath); if (file.exists()) { boolean succeed = file.delete(); - System.out.println("鍒犻櫎鏂囦欢--->" + fullPath + "===缁撴灉--->" + succeed); + System.out.println("鍒犻櫎鏂囦欢---" + fullPath + "===缁撴灉---" + succeed); return succeed; } return true; @@ -274,9 +356,9 @@ d.write(data); d.flush(); d.close(); - System.out.println("鍐欏叆鏂囦欢鎴愬姛--->" + fullPath); + System.out.println("鍐欏叆鏂囦欢鎴愬姛---" + fullPath); } catch (Exception e) { - System.out.println("鍐欏叆鏂囦欢鏈夊紓甯�--->" + e.getMessage()); + System.out.println("鍐欏叆鏂囦欢鏈夊紓甯�---" + e.getMessage()); } } @@ -315,12 +397,12 @@ d.flush(); d.close(); if (file.length() > 1024 * 1024 * mDataSize) { - //鏂囦欢澶т簬1m,鍒犻櫎鏂囦欢鍓�20鏉℃棩蹇� - this.delFileLien(fullPath, 20); + //鏂囦欢澶т簬1m,鍒犻櫎鏂囦欢鍓�100鏉℃棩蹇� + this.delFileLien(fullPath, 100); } - System.out.println("鍐欏叆涓�琛屾暟鎹埌鏂囦欢鎴愬姛--->" + dataLine); +// System.out.println("鍐欏叆涓�琛屾暟鎹埌鏂囦欢鎴愬姛---" + dataLine); } catch (Exception e) { - System.out.println("鍐欏叆涓�琛屾暟鎹埌鏂囦欢鏈夊紓甯�--->" + e.getMessage()); + System.out.println("鍐欏叆涓�琛屾暟鎹埌鏂囦欢鏈夊紓甯�---" + e.getMessage()); } } @@ -343,10 +425,10 @@ FileInputStream fis = new FileInputStream(f); byte[] bytes = FileUtils.readFileToByteArray(f);//杩欎釜鏂规硶涓嶅吋鐢╝ndroid 6.0 fis.close(); - System.out.println("璇诲彇鏂囦欢鎴愬姛--->" + filePath); + System.out.println("璇诲彇鏂囦欢鎴愬姛---" + filePath); return bytes; } catch (Exception e1) { - System.out.println("璇诲彇鏂囦欢鏈夊紓甯�--->" + e1.getMessage()); + System.out.println("璇诲彇鏂囦欢鏈夊紓甯�---" + e1.getMessage()); return null; } @@ -375,10 +457,10 @@ int len = bis.read(bytes); bis.close(); fis.close(); - System.out.println("璇诲彇鏂囦欢鎴愬姛--->" + filePath); + System.out.println("璇诲彇鏂囦欢鎴愬姛---" + filePath); return bytes; } catch (Exception e1) { - System.out.println("璇诲彇鏂囦欢鏈夊紓甯�--->" + e1.getMessage()); + System.out.println("璇诲彇鏂囦欢鏈夊紓甯�---" + e1.getMessage()); return null; } @@ -421,7 +503,7 @@ fileLength = f.length(); return new FileInputStream(f); } catch (Exception e1) { - System.out.println("璇诲彇鏂囦欢鏈夊紓甯�--->" + e1.getMessage()); + System.out.println("璇诲彇鏂囦欢鏈夊紓甯�---" + e1.getMessage()); return null; } @@ -505,7 +587,7 @@ */ public boolean isBoolean(String path) { if (path.contains("//") || path.contains("\\")) { - System.out.println("鏃犳晥鏂囦欢璺緞--->" + path); + System.out.println("鏃犳晥鏂囦欢璺緞---" + path); return false; } return true; -- Gitblit v1.8.0