优化代码

app/src/main/java/com/xypower/mpapp/MainActivity.java

@@ -1,8 +1,6 @@
 package com.xypower.mpapp;
 
 import android.Manifest;
-import android.app.Activity;
-import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -11,7 +9,6 @@ import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Build;
-import android.os.Environment;
 import android.os.FileObserver;
 import android.os.Handler;
 import android.os.Looper;
@@ -38,15 +35,12 @@ import android.widget.Toast;
 
 import com.dev.devapi.api.SysApi;
 import com.xypower.common.CameraUtils;
-import com.xypower.common.FilesUtils;
-import com.xypower.common.JSONUtils;
 import com.xypower.common.MicroPhotoContext;
 import com.xypower.mpapp.databinding.ActivityMainBinding;
+import com.xypower.mpapp.utils.LocationUtil;
 import com.xypower.mpapp.utils.RandomReader;
 
 
-import org.json.JSONObject;
-
 import java.io.File;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;

app/src/main/java/com/xypower/mpapp/MicroPhotoService.java

@@ -50,23 +50,20 @@ import android.widget.Toast;
 
 import com.dev.devapi.api.SysApi;
 import com.xypower.common.FileDownloader;
-import com.xypower.common.FilesUtils;
 import com.xypower.common.NetworkUtils;
 import com.xypower.common.MicroPhotoContext;
 import com.xypower.mpapp.adb.CameraAdb;
+import com.xypower.mpapp.utils.DeviceUtil;
 import com.xypower.mpapp.v2.Camera2VideoActivity;
 
 import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 public class MicroPhotoService extends Service {
     public static final String TAG = "MPLOG";

app/src/main/java/com/xypower/mpapp/Upgrader.java

@@ -1,4 +0,0 @@
-package com.xypower.mpapp;
-
-public class Upgrader {
-}

app/src/main/java/com/xypower/mpapp/utils/AlarmUtil.java

@@ -1,4 +1,4 @@
-package com.xypower.mpapp;
+package com.xypower.mpapp.utils;
 
 import static android.content.Context.ALARM_SERVICE;
 

app/src/main/java/com/xypower/mpapp/utils/DeviceUtil.java

@@ -1,4 +1,4 @@
-package com.xypower.mpapp;
+package com.xypower.mpapp.utils;
 
 import android.app.AlarmManager;
 import android.content.Context;

app/src/main/java/com/xypower/mpapp/utils/LocationUtil.java

@@ -1,4 +1,4 @@
-package com.xypower.mpapp;
+package com.xypower.mpapp.utils;
 
 import android.Manifest;
 import android.content.Context;