diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/LogFormatter.java b/common/src/main/java/com/xypower/common/LogFormatter.java similarity index 94% rename from mpmaster/src/main/java/com/xypower/mpmaster/LogFormatter.java rename to common/src/main/java/com/xypower/common/LogFormatter.java index ca7a20de..407654cc 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/LogFormatter.java +++ b/common/src/main/java/com/xypower/common/LogFormatter.java @@ -1,7 +1,5 @@ -package com.xypower.mpmaster; +package com.xypower.common; -import java.io.PrintWriter; -import java.io.StringWriter; import java.text.SimpleDateFormat; import java.util.Date; import java.util.logging.ConsoleHandler; diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/LogcatHandler.java b/common/src/main/java/com/xypower/common/LogcatHandler.java similarity index 98% rename from mpmaster/src/main/java/com/xypower/mpmaster/LogcatHandler.java rename to common/src/main/java/com/xypower/common/LogcatHandler.java index abf8c103..787024ed 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/LogcatHandler.java +++ b/common/src/main/java/com/xypower/common/LogcatHandler.java @@ -1,4 +1,4 @@ -package com.xypower.mpmaster; +package com.xypower.common; import android.util.Log; import java.util.logging.Handler; diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/RotatingHandler.java b/common/src/main/java/com/xypower/common/RotatingHandler.java similarity index 99% rename from mpmaster/src/main/java/com/xypower/mpmaster/RotatingHandler.java rename to common/src/main/java/com/xypower/common/RotatingHandler.java index 97d67942..bce98d27 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/RotatingHandler.java +++ b/common/src/main/java/com/xypower/common/RotatingHandler.java @@ -1,4 +1,4 @@ -package com.xypower.mpmaster; +package com.xypower.common; import java.io.File; import java.io.FileNotFoundException; diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java index 923ab109..5eb9b5b5 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java @@ -691,6 +691,7 @@ public class AppMaster { context.startActivity(intent); } } catch (Exception e) { + mService.logger.info("Exception on starting Frp Server " + e.getMessage()); e.printStackTrace(); } } diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index 3b7b75c3..b5c35dd5 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -12,15 +12,11 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.net.ConnectivityManager; -import android.os.BatteryManager; import android.os.Build; import android.os.Environment; import android.os.Handler; import android.os.IBinder; -import android.os.Message; import android.os.PowerManager; -import android.telephony.SignalStrength; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -34,7 +30,10 @@ import androidx.core.app.NotificationCompat; import com.dev.devapi.api.SysApi; import com.xypower.common.FileDownloader; import com.xypower.common.JSONUtils; +import com.xypower.common.LogFormatter; +import com.xypower.common.LogcatHandler; import com.xypower.common.MicroPhotoContext; +import com.xypower.common.RotatingHandler; import com.xypower.mpmaster.sms.SimUtil; import com.xypower.mpmaster.sms.SmsSendReceiver; @@ -43,13 +42,9 @@ import org.json.JSONObject; import java.io.File; import java.lang.reflect.Method; import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.Arrays; -import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.logging.FileHandler; import java.util.logging.Level; import java.util.logging.Logger;