set up sos press cover old alarm cycle.

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 8e53013..3860940 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -212,6 +212,7 @@ public class CoreService extends Service {
                 //runtime.setPpgTestCycle(1);
                 setLocationAlarm(runtime.getLocationInstance().getWorkingMod());
                 //触发一次心率检测
+                ICLogger.d("ACTION_SEND_EMEGENCY_LOCATION_START == > setHeartRateDetectAlarm ");
                 setHeartRateDetectAlarm(1);
                 setEmegencyLocationSTOPAlarm(5);
             } else if (ACTION_LOCAL_SOS_ACTION.endsWith(param1Intent.getAction())) {
@@ -220,6 +221,7 @@ public class CoreService extends Service {
                 boolean needHRSTestOnSOS = Util.getSystemProperties("persist.sys.needHRSOnSOS", "false").equals("true");
                 if (needHRSTestOnSOS) {
                     //触发一次心率检测
+                    ICLogger.d("needHRSTestOnSOS =}}= > setHeartRateDetectAlarm ");
                     setHeartRateDetectAlarm(1);
                 }
                 runtime.setAlarmType(Runtime.AlarmType.ALARM_SOS);
@@ -235,6 +237,7 @@ public class CoreService extends Service {
                 //SOS模式，心率测试1分钟一次，持续5分钟
                 if (needHRSTestOnSOS) {
                     //只触发一次心率检测
+                    ICLogger.d("needHRSTestOnSOS == > setHeartRateDetectAlarm ");
                     setHeartRateDetectAlarm(1);
                 }
                 //设置5分钟后结束紧急定位模式
@@ -1349,7 +1352,7 @@ public class CoreService extends Service {
         ICLogger.d("heartRateDetectAlarmCycleMinutes  == >  " + heartRateDetectAlarmCycleMinutes);
         ICLogger.d("ppgtestCycle == > " + heartRateDetectAlarmCycleMinutes);
         //如果周期不为0，那么就设置到配置信息里头去。
-        if (heartRateDetectAlarmCycleMinutes > 0) {
+        if (heartRateDetectAlarmCycleMinutes > 1) {
             Config.setPPGTestCycle(runtime.getContextProxy().context, heartRateDetectAlarmCycleMinutes);
             runtime.setPpgTestCycle(Config.getPPGTestCycle(runtime.getContextProxy().context));
             ICLogger.i("get and set PPGTestCycle " + heartRateDetectAlarmCycleMinutes);

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 dc722f9..8ade8f1 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
@@ -20,8 +20,7 @@ public class AlarmHelper {
     private static final long ONE_WEEK = 604800000L;\r
 \r
     private static Method setImpl;\r
-\r
-\r
+    \r
     static {\r
         try {\r
             setImpl = AlarmManager.class.getDeclaredMethod("setImpl", new Class[]{int.class, long.class, long.class, long.class, PendingIntent.class, android.os.WorkSource.class});\r