From a4b509a8192353d1f7fafaa5a546b19679e36646 Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 12 Jul 2024 22:17:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=90=8C=E6=97=B6=E9=87=8D?= =?UTF-8?q?=E5=90=AFMpAPP=20=E5=92=8C=E8=BF=90=E7=BB=B4APP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java | 4 ++++ .../main/java/com/xypower/mpmaster/sms/SmsSendReceiver.java | 3 +++ .../src/main/java/com/xypower/mpmaster/sms/SmsTypeEnum.java | 2 ++ 3 files changed, 9 insertions(+) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java b/mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java index c4899d19..1b27a3ad 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java @@ -83,6 +83,10 @@ public class SimUtil { ifmessageCorrect = true; sendtype = SmsTypeEnum.RESTART_MPMST.value(); sendmessage = getSendString(content, ifmessageCorrect); + } else if (content.contains(SmsTypeEnum.RESTART_BOTH_APPS.value()) || content.contains(SmsTypeEnum.RESTART_BOTH_APPS2.value())) { + ifmessageCorrect = true; + sendtype = SmsTypeEnum.RESTART_BOTH_APPS.value(); + sendmessage = getSendString(content, ifmessageCorrect); } else if (content.contains(SmsTypeEnum.SET_YW_SCHEDULE.value())) { ifmessageCorrect = true; String[] split1 = StringUtils.splitString1(content); diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/sms/SmsSendReceiver.java b/mpmaster/src/main/java/com/xypower/mpmaster/sms/SmsSendReceiver.java index 4f8afc2c..a2b054fd 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/sms/SmsSendReceiver.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/sms/SmsSendReceiver.java @@ -64,6 +64,9 @@ public class SmsSendReceiver extends BroadcastReceiver { UpdateSysConfigUtil.restartApp(context); } else if (type.contains(SmsTypeEnum.RESTART_MPMST.value())) { UpdateSysConfigUtil.restartMasterApp(context); + } else if (type.contains(SmsTypeEnum.RESTART_BOTH_APPS.value())) { + UpdateSysConfigUtil.restartApp(context); + UpdateSysConfigUtil.restartMasterApp(context); } else if (type.contains(SmsTypeEnum.SET_YW_SCHEDULE.value())) { UpdateSysConfigUtil.restartMasterApp(context); } else if (type.contains(SmsTypeEnum.SET_OPERATE.value())) { diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/sms/SmsTypeEnum.java b/mpmaster/src/main/java/com/xypower/mpmaster/sms/SmsTypeEnum.java index 730323f5..208c04cd 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/sms/SmsTypeEnum.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/sms/SmsTypeEnum.java @@ -7,6 +7,8 @@ public enum SmsTypeEnum { RESTART_MP2("at-restart=mpapp"), RESTART_MPMST("at+restart=mpmaster"), RESTART_MPMST2("at-restart=mpmaster"), + RESTART_BOTH_APPS("at+restart=both"), + RESTART_BOTH_APPS2("at-restart=both"), SET_YW_SCHEDULE("yw+at+stw51"), //拍照时间表设置 GET_YW_SCHEDULE("yw+at+str51"), //查询拍照时间表 SET_OPERATE("yw+at+stw52"), //设置运维开关