优化代码

common/src/main/java/com/xypower/common/FilesUtils.java

@@ -135,7 +135,19 @@ public class FilesUtils {
             byte[] bytes = content.getBytes();
             fileOutputStream.write(bytes);
         } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            closeFriendly(fileOutputStream);
+        }
+    }
 
+    public static void writeFile(String path, byte[] bytes) {
+        FileOutputStream fileOutputStream = null;
+        try {
+            fileOutputStream = new FileOutputStream(path);
+            fileOutputStream.write(bytes);
+        } catch (Exception ex) {
+            ex.printStackTrace();
         } finally {
             closeFriendly(fileOutputStream);
         }
@@ -236,4 +248,8 @@ public class FilesUtils {
 
         return bytes;
     }
+
+    public static byte[] readAllBytes(String file) {
+        return readAllBytes(new File(file));
+    }
 }

common/src/main/java/com/xypower/common/JSONUtils.java

@@ -75,66 +75,6 @@ public class JSONUtils {
         return jsonObject;
     }
 
-
-    public static byte[] loadByte(String path) {
-        ByteArrayOutputStream out = null;
-        byte[] outbyte = null;
-        FileInputStream fis = null;
-        try {
-            File appCfgFile = new File(path);
-            if (appCfgFile.exists()) {
-                fis = new FileInputStream(appCfgFile);
-                byte[] bytes = new byte[1024 * 4];
-                int line = 0;
-                out = new ByteArrayOutputStream();
-                while ((line = fis.read(bytes)) != -1) {
-                    out.write(bytes, 0, line);
-//                    System.out.println("dfsdaf:" + bytes);
-                }
-                outbyte = out.toByteArray();
-            }
-
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (fis != null) {
-                try {
-                    fis.close();
-                    out.close();
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
-            }
-        }
-
-        return outbyte;
-    }
-
-    public static boolean saveByte(String path, byte[] jsonObject) {
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(new File(path));
-            fos.write(jsonObject);
-            return true;
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (fos != null) {
-                try {
-                    fos.close();
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
-            }
-        }
-
-        return false;
-    }
-
     public static boolean saveJson(String path, JSONObject jsonObject) {
         FileOutputStream fos = null;
         OutputStreamWriter outputStreamWriter = null;

common/src/main/java/com/xypower/common/MicroPhotoContext.java

@@ -10,7 +10,6 @@ import android.os.storage.StorageManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.dev.devapi.api.SysApi;
 
@@ -43,7 +42,6 @@ public class MicroPhotoContext {
     public final static int DEFAULT_HEARTBEAT_FOR_SHARED_NW = 10;  // minutes
     public final static int DEFAULT_QUICK_HEARTBEAT = 60;  // second
 
-
     public static class AppConfig {
         public String cmdid;
         public String server;

mpmaster/src/main/java/com/xypower/mpmaster/DashboardActivity.java

@@ -5,12 +5,11 @@ import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
+import android.util.Base64;
 
 import com.dev.devapi.api.SysApi;
 import com.xypower.mpmaster.sms.UpdateSysConfigUtil;
 
-import java.util.Base64;
-
 public class DashboardActivity extends AppCompatActivity {
 
     @Override
@@ -173,7 +172,7 @@ public class DashboardActivity extends AppCompatActivity {
                 byte[] bytes = {1, 1, 2, 0, 0, 0, 23, 59};
                 String photoSchedules = UpdateSysConfigUtil.getPhotoSchedules(1);
 
-                byte[] decode = Base64.getDecoder().decode(photoSchedules);
+                byte[] decode = Base64.decode(photoSchedules, Base64.DEFAULT);
                 System.out.println(decode);
 
             }

mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java

@@ -1,12 +1,10 @@
 package com.xypower.mpmaster;
 
-
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 
 import android.Manifest;
-import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -18,21 +16,12 @@ import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.Switch;
 import android.widget.TextView;
 
-
-import com.dev.devapi.api.SysApi;
-import com.xypower.common.HotspotManager;
 import com.xypower.common.MicroPhotoContext;
-import com.xypower.mpmaster.sms.UpdateSysConfigUtil;
 
 import java.text.SimpleDateFormat;
-import java.util.Base64;
 import java.util.Date;
-import java.util.List;
-
 
 public class MainActivity extends AppCompatActivity {
 

mpmaster/src/main/java/com/xypower/mpmaster/sms/UpdateSysConfigUtil.java

@@ -6,6 +6,8 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Environment;
+import android.provider.MediaStore;
+import android.util.Base64;
 
 import com.xypower.common.FilesUtils;
 import com.xypower.common.JSONUtils;
@@ -15,7 +17,6 @@ import org.json.JSONObject;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 
@@ -388,26 +389,20 @@ public class UpdateSysConfigUtil {
     //拍照时间表修改
     public static void setPhotoSchedules(int channel, String msg) {
         if (StringUtils.isNotEmpty(msg)) {
-            byte[] decode = new byte[0];
+            byte[] decode = Base64.decode(msg, Base64.DEFAULT);
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-                decode = Base64.getDecoder().decode(msg);
-            }
             if (decode != null && decode.length > 0) {
                 String path = getScheduleDir(channel);
-                JSONUtils.saveByte(path, decode);
+                FilesUtils.writeFile(path, decode);
             }
         }
     }
 
-
     //获取拍照时间表
     public static String getPhotoSchedules(int channel) {
         String msg = "";
         String path = getScheduleDir(channel);
-        byte[] bytes = JSONUtils.loadByte(path);
+        byte[] bytes = FilesUtils.readAllBytes(path);
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+        msg = Base64.encodeToString(bytes, Base64.DEFAULT);
-            msg = Base64.getEncoder().encodeToString(bytes);
-        }
         return msg;
     }
 }