From b93ca15aa55af7cf2dee653beb100076c897f152 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 16:56:38 +0800
Subject: [PATCH] 2024年06月25日16:56:31

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java |  105 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 85 insertions(+), 20 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 d45e982..76133f3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
@@ -1,8 +1,11 @@
 package com.hdl.photovoltaic.other;
 
+import android.content.Context;
+import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Environment;
+import android.text.TextUtils;
 
 import com.hdl.photovoltaic.HDLApp;
 import com.hdl.photovoltaic.config.UserConfigManage;
@@ -15,6 +18,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Objects;
@@ -27,9 +31,9 @@
     private static volatile HdlFileLogic sHdlFileLogic;
 
     /**
-     * 琛ㄧず1m澶у皬鏁版嵁
+     * 琛ㄧず0.5m澶у皬鏁版嵁
      */
-    private final int mDataSize = 1;
+    private final double mDataSize = 0.5;
 
     /**
      * 鑾峰彇褰撳墠瀵硅薄
@@ -95,6 +99,8 @@
         return getAPPInternalStoreFilesPath() + "/upgrade/firmware";
     }
 
+
+
     /**
      * 鑾峰彇銆愭棩蹇楁枃浠躲�戝叏璺緞
      */
@@ -124,13 +130,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;
     }
 
@@ -162,7 +167,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;
@@ -195,7 +200,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());
         }
@@ -218,7 +223,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;
@@ -239,7 +244,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;
@@ -270,9 +275,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());
         }
 
     }
@@ -311,15 +316,43 @@
             d.flush();
             d.close();
             if (file.length() > 1024 * 1024 * mDataSize) {
-                //鏂囦欢澶т簬1m,鍒犻櫎鏂囦欢鍓�10鏉℃棩蹇�
-                this.delFileLien(fullPath, 10);
+                //鏂囦欢澶т簬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());
         }
 
     }
+
+    /**
+     * 璇诲彇鏂囦欢
+     *
+     * @param filePath 鍏ㄨ矾寰�
+     * @return 鏁版嵁
+     */
+    public byte[] readFileByte1(String filePath) {
+        try {
+            if (!isBoolean(filePath)) {
+                return null;
+            }
+            File f = new File(filePath);
+            if (!f.exists()) {
+                return null;
+            }
+            FileInputStream fis = new FileInputStream(f);
+            byte[] bytes = FileUtils.readFileToByteArray(f);//杩欎釜鏂规硶涓嶅吋鐢╝ndroid 6.0
+            fis.close();
+            System.out.println("璇诲彇鏂囦欢鎴愬姛---" + filePath);
+            return bytes;
+        } catch (Exception e1) {
+            System.out.println("璇诲彇鏂囦欢鏈夊紓甯�---" + e1.getMessage());
+            return null;
+        }
+
+    }
+
 
     /**
      * 璇诲彇鏂囦欢
@@ -337,12 +370,16 @@
                 return null;
             }
             FileInputStream fis = new FileInputStream(f);
-            byte[] bytes = FileUtils.readFileToByteArray(f);
+            BufferedInputStream bis = new BufferedInputStream(fis);
+            int fileLength = (int) f.length();
+            byte[] bytes = new byte[fileLength];
+            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;
         }
 
@@ -385,7 +422,7 @@
             fileLength = f.length();
             return new FileInputStream(f);
         } catch (Exception e1) {
-            System.out.println("璇诲彇鏂囦欢鏈夊紓甯�--->" + e1.getMessage());
+            System.out.println("璇诲彇鏂囦欢鏈夊紓甯�---" + e1.getMessage());
             return null;
         }
 
@@ -434,6 +471,34 @@
     }
 
     /**
+     * 鎵撳紑璧勬簮鏂囦欢
+     *
+     * @param fileName 鏂囦欢鍚�
+     * @param context  涓婁笅鏂�
+     * @return 杩斿洖json瀛楃涓�
+     */
+    public String openAssetsFileJson(String fileName, Context context) {
+        if (TextUtils.isEmpty(fileName)) {
+            return "";
+        }
+        //灏唈son鏁版嵁鍙樻垚瀛楃涓�
+        StringBuilder stringBuilder = new StringBuilder();
+        try {
+            //鑾峰彇assets璧勬簮绠$悊鍣�
+            AssetManager assetManager = context.getAssets();
+            //閫氳繃绠$悊鍣ㄦ墦寮�鏂囦欢骞惰鍙�
+            BufferedReader bf = new BufferedReader(new InputStreamReader(assetManager.open(fileName)));
+            String line;
+            while ((line = bf.readLine()) != null) {
+                stringBuilder.append(line);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return stringBuilder.toString();
+    }
+
+    /**
      * 鍒ゆ柇璺緞鏄惁鍚堟硶
      *
      * @param path 璺緞
@@ -441,7 +506,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