From 59bd3144c8a54654a75cff4bc981891800b9ac65 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Sat, 17 Aug 2024 09:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/xypower/mpapp/MainActivity.java     | 8 +-------
 .../main/java/com/xypower/mpapp/MicroPhotoService.java    | 5 +----
 app/src/main/java/com/xypower/mpapp/Upgrader.java         | 4 ----
 .../java/com/xypower/mpapp/{ => utils}/AlarmUtil.java     | 2 +-
 .../java/com/xypower/mpapp/{ => utils}/DeviceUtil.java    | 2 +-
 .../java/com/xypower/mpapp/{ => utils}/LocationUtil.java  | 2 +-
 6 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 app/src/main/java/com/xypower/mpapp/Upgrader.java
 rename app/src/main/java/com/xypower/mpapp/{ => utils}/AlarmUtil.java (99%)
 rename app/src/main/java/com/xypower/mpapp/{ => utils}/DeviceUtil.java (99%)
 rename app/src/main/java/com/xypower/mpapp/{ => utils}/LocationUtil.java (99%)

diff --git a/app/src/main/java/com/xypower/mpapp/MainActivity.java b/app/src/main/java/com/xypower/mpapp/MainActivity.java
index 9ec6f4ce..fbcdfd63 100644
--- a/app/src/main/java/com/xypower/mpapp/MainActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
index eed94393..32145db3 100644
--- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
+++ b/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";
diff --git a/app/src/main/java/com/xypower/mpapp/Upgrader.java b/app/src/main/java/com/xypower/mpapp/Upgrader.java
deleted file mode 100644
index 08c2e1e4..00000000
--- a/app/src/main/java/com/xypower/mpapp/Upgrader.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.xypower.mpapp;
-
-public class Upgrader {
-}
diff --git a/app/src/main/java/com/xypower/mpapp/AlarmUtil.java b/app/src/main/java/com/xypower/mpapp/utils/AlarmUtil.java
similarity index 99%
rename from app/src/main/java/com/xypower/mpapp/AlarmUtil.java
rename to app/src/main/java/com/xypower/mpapp/utils/AlarmUtil.java
index 3b666446..418aaa4d 100644
--- a/app/src/main/java/com/xypower/mpapp/AlarmUtil.java
+++ b/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;
 
diff --git a/app/src/main/java/com/xypower/mpapp/DeviceUtil.java b/app/src/main/java/com/xypower/mpapp/utils/DeviceUtil.java
similarity index 99%
rename from app/src/main/java/com/xypower/mpapp/DeviceUtil.java
rename to app/src/main/java/com/xypower/mpapp/utils/DeviceUtil.java
index 1af1e0a9..095a17f5 100644
--- a/app/src/main/java/com/xypower/mpapp/DeviceUtil.java
+++ b/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;
diff --git a/app/src/main/java/com/xypower/mpapp/LocationUtil.java b/app/src/main/java/com/xypower/mpapp/utils/LocationUtil.java
similarity index 99%
rename from app/src/main/java/com/xypower/mpapp/LocationUtil.java
rename to app/src/main/java/com/xypower/mpapp/utils/LocationUtil.java
index 1cd7d776..3cf5aefa 100644
--- a/app/src/main/java/com/xypower/mpapp/LocationUtil.java
+++ b/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;