From b00931aa269cbf24fda2fd1e14b8802ff3e8c29f Mon Sep 17 00:00:00 2001 From: snickersun Date: Mon, 9 Mar 2020 12:16:11 +0800 Subject: [PATCH] =?utf8?q?1=E3=80=81=E7=9F=AD=E4=BF=A1=E5=91=BD=E4=BB=A4?= =?utf8?q?=E6=B7=BB=E5=8A=A0=20=E9=87=8D=E5=90=AF=EF=BC=8C=E5=85=B3?= =?utf8?q?=E6=9C=BA=EF=BC=8C=E6=81=A2=E5=A4=8D=E5=B7=A5=E5=8E=82=E8=AE=BE?= =?utf8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD=E3=80=82=20#reboot#=20,#poweroff#,?= =?utf8?q?=20#factoryreset#=202=E3=80=81=E4=BF=AE=E5=A4=8D=E7=9F=AD?= =?utf8?q?=E4=BF=A1=E5=91=BD=E4=BB=A4=E8=AE=BE=E7=BD=AEimei=E4=B8=8D?= =?utf8?q?=E8=83=BD=E5=8D=B3=E6=97=B6=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?= =?utf8?q?=E9=A2=98=E3=80=82=203=E3=80=81=E4=BF=AE=E5=A4=8D=E8=AE=BE?= =?utf8?q?=E7=BD=AE=20=E9=97=B9=E9=93=83=EF=BC=8C=E6=B2=A1=E6=9C=89?= =?utf8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E4=B8=8D?= =?utf8?q?=E8=83=BD=E9=97=B9=E9=93=83=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../java/com/enqualcomm/support/CoreService.java | 3 +++ .../java/com/enqualcomm/support/ICSmsManager.java | 9 +++++++++ .../enqualcomm/support/service/SilentManager.java | 14 ++++++++++++++ .../com/enqualcomm/support/utils/AlarmHelper.java | 7 +++++-- .../enqualcomm/support/utils/NettyConnection.java | 2 +- 5 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index 1fe53e4e..46e1e6d8 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -587,6 +587,9 @@ public class CoreService extends Service { getDBFile(); } + public static void DevliverStringMessage(String cmd){ + CoreService.getInstance().connection.DeliverCMDMessageToSystem(cmd,""); + } public int onStartCommand(Intent paramIntent, int paramInt1, int paramInt2) { diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index 2da348d7..6d05ce58 100644 --- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java +++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java @@ -576,6 +576,15 @@ public class ICSmsManager { } else { sendSMS(phonenumber, "USB cmd format error!"); } + }else if (sms.startsWith("#factoryreset#")) { + sendSMS(phonenumber, "do factoryreset!"); + CoreService.DevliverStringMessage("FactoryReset"); + }else if (sms.startsWith("#reboot#")) { + sendSMS(phonenumber, "do reboot!"); + CoreService.DevliverStringMessage("Reboot"); + }else if (sms.startsWith("#poweroff#")) { + sendSMS(phonenumber, "do poweroff!"); + CoreService.DevliverStringMessage("poweroff"); }else { return false; } diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java index c1a7763c..97932b1f 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java @@ -562,6 +562,9 @@ public class SilentManager extends AbstractInvokeHandlerService { char[] weeklist = alarm.week.toCharArray(); int weeklistlen = weeklist.length; + ICLogger.i("repeat = "+alarm.week+", list size = "+weeklistlen); + if (weeklistlen>1) { + //如果week大于0 则证明有循环，没有循环就证明只是一次的闹铃。 for (int i = 1; i < weeklistlen; i++) { long tmpTimeInMillis; @@ -574,6 +577,17 @@ public class SilentManager extends AbstractInvokeHandlerService { PendingIntent pendingIntent = this.getPendingIntent(alarm.time, alarm.week, alarm.ring, alarm.name, dayofweek); AlarmHelper.setAlarm(this.mAlarmManager, tmpTimeInMillis, pendingIntent); } + }else{ + //只是一次的闹铃 + long tmpTimeInMillis; +// int dayofweek = weeklist[i] - 47; +// calendar.set(Calendar.DAY_OF_WEEK, dayofweek); + tmpTimeInMillis = calendar.getTimeInMillis(); + PendingIntent pendingIntent = this.getPendingIntent(alarm.time, alarm.week, alarm.ring, alarm.name, 0); + AlarmHelper.setAlarmOnce(this.mAlarmManager, tmpTimeInMillis, pendingIntent); + } + + } } diff --git a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java index cdd566c4..25081192 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java +++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java @@ -50,10 +50,13 @@ public class AlarmHelper { //以周为单位设置循环闹铃 public static void setAlarm(AlarmManager paramAlarmManager, long triggerAtMillis, PendingIntent paramPendingIntent) { + ICLogger.i("setAlarm triggerAtMillis "+triggerAtMillis); setAlarm(paramAlarmManager, triggerAtMillis, ONE_WEEK, paramPendingIntent); - } - + public static void setAlarmOnce(AlarmManager paramAlarmManager, long triggerAtMillis, PendingIntent paramPendingIntent) { + ICLogger.i("setAlarmOnce triggerAtMillis "+triggerAtMillis); + setAlarm(paramAlarmManager, triggerAtMillis, 0, paramPendingIntent); + } public static void setCleanStepCountAlarm(Context context, int hour, int minutes, String paramString) { AlarmManager alarmManager = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE); Intent intent = new Intent(context, com.enqualcomm.support.CoreService.class); diff --git a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java index 6280ce07..9787abdd 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java +++ b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java @@ -203,7 +203,7 @@ public class NettyConnection implements Connection { public void close() { // listener =null; // RxSocket.getInstance().setConnectionListener(null); - + this.disconnect(); } public void connect(final String host, final int port) { -- 2.17.1