From bcda473b407c4853c8cc3c568e99505be59f57bb Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 19 Feb 2025 18:23:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=8D=E5=90=AFMpAPP?= =?UTF-8?q?=E7=9A=84=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xypower/mpmaster/MainActivity.java | 14 +++++++++++++- mpmaster/src/main/res/menu/menu_main.xml | 6 ++++++ mpmaster/src/main/res/values/strings.xml | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) 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 刷新