From: snickersun <scy@incartech.cn>
Date: Mon, 9 Mar 2020 04:16:11 +0000 (+0800)
Subject: 1、短信命令添加 重启，关机，恢复工厂设置功能。 #reboot# ,#poweroff#, #factoryreset#
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=b00931aa269cbf24fda2fd1e14b8802ff3e8c29f;p=icsupport.git

1、短信命令添加 重启，关机，恢复工厂设置功能。 #reboot# ,#poweroff#, #factoryreset#
2、修复短信命令设置imei不能即时生效的问题。
3、修复设置 闹铃，没有重复的时候，不能闹铃的问题。
---

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) {