diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java b/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java index d96cf0e6..2d1bce84 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java @@ -129,10 +129,22 @@ public class MainActivity extends AppCompatActivity { startActivity(intent); } break; - case R.id.action_reboot_mp:{ + case R.id.action_notify_mp_reboot:{ MicroPhotoContext.restartMpApp(getApplicationContext(), "Manual Restart from MpMst"); } break; + + case R.id.action_reboot_mp: { + Context context = getApplicationContext(); + Intent intent = context.getPackageManager().getLaunchIntentForPackage(MicroPhotoContext.PACKAGE_NAME_MPAPP); + int noDelay = 1; + intent.putExtra("noDelay", noDelay); + intent.putExtra("reason", "Manual Restart from MpMst"); + + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + context.startActivity(intent); + } + break; case R.id.action_reboot_mpmst:{ MpMasterService.restartApp(getApplicationContext()); } diff --git a/mpmaster/src/main/res/menu/menu_main.xml b/mpmaster/src/main/res/menu/menu_main.xml index f5a22eaa..350a55ee 100644 --- a/mpmaster/src/main/res/menu/menu_main.xml +++ b/mpmaster/src/main/res/menu/menu_main.xml @@ -17,6 +17,12 @@ android:title="@string/btn_dashboard" app:showAsAction="never" /> + + 运维APP Notification Name 操作区 + 通知MpAPP自重启 重启MpAPP 重启运维APP 刷新