diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java index be6cc8d0..0e222dd6 100644 --- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java +++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java @@ -105,7 +105,7 @@ public class MicroPhotoService extends Service { // private static final String EXTRA_PARAM_TIMEOUT = "Timeout"; // private static final String EXTRA_PARAM_TIMES = "Times"; // private static final String EXTRA_PARAM_ELASPED_TIMES = "ElapsedTimes"; - private static final String FOREGROUND_CHANNEL_ID = "foreground_channel_id"; + private static final String FOREGROUND_CHANNEL_ID = "fg_mpapp"; public static class STATE_SERVICE { public static final int CONNECTED = 10; public static final int NOT_CONNECTED = 0; diff --git a/mpmaster/build.gradle b/mpmaster/build.gradle index 1d86ae7f..64e9c0b8 100644 --- a/mpmaster/build.gradle +++ b/mpmaster/build.gradle @@ -4,7 +4,7 @@ plugins { def AppMajorVersion = 1 def AppMinorVersion = 0 -def AppBuildNumber = 62 +def AppBuildNumber = 63 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java index 5eb9b5b5..a32b8938 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java @@ -703,7 +703,7 @@ public class AppMaster { Intent intent = context.getPackageManager().getLaunchIntentForPackage("com.xypower.frpandroid"); if (intent != null) { intent.putExtra("autoClose", 1); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); context.startActivity(intent); } } catch (Exception e) { diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index b5c35dd5..50ecb0e3 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -76,7 +76,7 @@ public class MpMasterService extends Service { public static final String ACTION_MP_RESTART = "com.xypower.mpapp.ACT_START"; public static final String ACTION_IMP_PUBKRY = "com.xypower.mpapp.ACT_IMP_PUBKEY"; - private static final String FOREGROUND_CHANNEL_ID = "foreground_channel_id"; + private static final String FOREGROUND_CHANNEL_ID = "fg_mpmst"; private SmsSendReceiver mSmsSnedReceiver; private int mPrevDateForLogs = 0;