From f9956641e92cce3ece4cdff523a6e453f159d268 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 21 十二月 2023 11:58:30 +0800
Subject: [PATCH] 2023年12月21日11:58:13
---
app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 66a7cec..b9d92d0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
@@ -126,12 +126,13 @@
/**
* 鑾峰彇鍥轰欢鍗囩骇鏂囦欢鍏ㄨ矾寰�
*
- * @param oid
+ * @param oid 璇ュ浐浠秓id
+ * @param imageId 闀滃儚id
* @param version 椹卞姩鐗堟湰
* @return 鍏ㄨ矾寰�
*/
- public String getFirmwarePathFileName(String oid, String version) {
- String fileName = oid + "_" + version + ".zip";
+ public String getFirmwarePathFileName(String oid, String imageId, String version) {
+ String fileName = oid + "_" + imageId + "_" + version + ".zip";
return HdlFileLogic.getInstance().getFirmwareRootPath() + "/" + fileName;
}
@@ -163,7 +164,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;
@@ -196,7 +197,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());
}
@@ -219,7 +220,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;
@@ -240,7 +241,7 @@
File file = new File(fullPath);
if (file.exists()) {
boolean succeed = file.delete();
- System.out.println("鍒犻櫎鏂囦欢===" + succeed);
+ System.out.println("鍒犻櫎鏂囦欢--->" + fullPath + "===缁撴灉--->" + succeed);
return succeed;
}
return true;
@@ -271,9 +272,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,9 +316,9 @@
//鏂囦欢澶т簬1m,鍒犻櫎鏂囦欢鍓�10鏉℃棩蹇�
this.delFileLien(fullPath, 10);
}
- System.out.println("鍐欏叆涓�琛屾暟鎹埌鏂囦欢鎴愬姛===" + dataLine);
+ System.out.println("鍐欏叆涓�琛屾暟鎹埌鏂囦欢鎴愬姛--->" + dataLine);
} catch (Exception e) {
- System.out.println("鍐欏叆涓�琛屾暟鎹埌鏂囦欢鏈夊紓甯�===" + e.getMessage());
+ System.out.println("鍐欏叆涓�琛屾暟鎹埌鏂囦欢鏈夊紓甯�--->" + e.getMessage());
}
}
@@ -340,10 +341,10 @@
FileInputStream fis = new FileInputStream(f);
byte[] bytes = FileUtils.readFileToByteArray(f);
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;
}
@@ -386,7 +387,7 @@
fileLength = f.length();
return new FileInputStream(f);
} catch (Exception e1) {
- System.out.println("璇诲彇鏂囦欢鏈夊紓甯�===" + e1.getMessage());
+ System.out.println("璇诲彇鏂囦欢鏈夊紓甯�--->" + e1.getMessage());
return null;
}
@@ -442,7 +443,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