From: TrillGates <williamtrillgates@gmail.com>
Date: Fri, 15 Jan 2021 02:06:45 +0000 (+0800)
Subject: fixed alarm heart test cycle default values issues.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=c316b1a8c4b64c4f5d5fcc42b169951a3392710e;p=protocol_srv.git

fixed alarm heart test cycle default values issues.
---

diff --git a/app/release/ICSer_V750_2101141023_release.apk b/app/release/ICSer_V751_2101141810_release.apk
similarity index 78%
rename from app/release/ICSer_V750_2101141023_release.apk
rename to app/release/ICSer_V751_2101141810_release.apk
index 953b449a..ae8df78c 100644
Binary files a/app/release/ICSer_V750_2101141023_release.apk and b/app/release/ICSer_V751_2101141810_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index f436f365..4a90c635 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":750,"versionName":"2101141023","enabled":true,"outputFile":"ICSer_V750_2101141023_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V750_2101141023_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":751,"versionName":"2101141810","enabled":true,"outputFile":"ICSer_V751_2101141810_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V751_2101141810_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 45cd9223..64f0c044 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -1296,12 +1296,6 @@ public class CoreService extends Service {
                 //此消息来源于BroadCaset，收到开始测试的消息。
                 //此时需要重置HeartRateDetect Timer
                 //倘若有 参数 PPGTestCycle,则根据这个数值进行设置
-                int ppgtestCycle = paramIntent.getIntExtra("PPGTestCycle", -1);
-                if (ppgtestCycle > 0) {
-                    Config.setPPGTestCycle(runtime.getContextProxy().context, ppgtestCycle);
-                    runtime.setPpgTestCycle(Config.getPPGTestCycle(runtime.getContextProxy().context));
-                    ICLogger.i("get and set PPGTestCycle " + ppgtestCycle);
-                }
                 setHeartRateDetectAlarm(runtime.getPpgTestCycle());//重置心率检测周期，并触发一次检测
 
             } else if (ACTION_SEND_EMEGENCY_LOCATION_STOP.equals(paramIntent.getAction())) {
@@ -1336,6 +1330,14 @@ public class CoreService extends Service {
             ICLogger.i("setHeartRateDetectAlarm oPPGSensor");
             return;
         }
+        ICLogger.d("heartRateDetectAlarmCycleMinutes  == >  " + heartRateDetectAlarmCycleMinutes);
+        ICLogger.d("ppgtestCycle == > " + heartRateDetectAlarmCycleMinutes);
+        //如果周期不为0，那么就设置到配置信息里头去。
+        if (heartRateDetectAlarmCycleMinutes > 0) {
+            Config.setPPGTestCycle(runtime.getContextProxy().context, heartRateDetectAlarmCycleMinutes);
+            runtime.setPpgTestCycle(Config.getPPGTestCycle(runtime.getContextProxy().context));
+            ICLogger.i("get and set PPGTestCycle " + heartRateDetectAlarmCycleMinutes);
+        }
         StringBuilder sb = new StringBuilder();
         if (heartRateDetectAlarmCycleMinutes > 1) {
             AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context, heartRateDetectAlarmCycleMinutes, ACTION_HEATR_RATE_START);
diff --git a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
index c2ac4da6..fa10295a 100644
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -300,7 +300,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
         if (CoreService.getInstance() != null) {
             if (CoreService.getInstance().getRuntime().Anti_off_flag == 1) {
                 ICLogger.i("未佩戴，取消 triggerPPGtest！");
-                return;
+                //return;
             }
         }
         //开始去测试
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 d8c9362e..d0771362 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
@@ -7,6 +7,8 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.SystemClock;
 
+import com.enqualcomm.support.CoreService;
+
 import java.lang.reflect.Method;
 import java.util.Calendar;
 
@@ -80,7 +82,7 @@ public class AlarmHelper {
     public static void setRealTimeAlarm(Context context, int minutes, String actionname) {
         ICLogger.d("minutes == > " + minutes + " action name is == > " + actionname);
         AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-        Intent intent = new Intent(context, com.enqualcomm.support.CoreService.class);
+        Intent intent = new Intent(context, CoreService.class);
         intent.setAction(actionname);
         PendingIntent pendingIntent = PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         alarmManager.cancel(pendingIntent);
diff --git a/app/version_code.properties b/app/version_code.properties
index dad5171f..1961391a 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Jan 14 10:23:22 CST 2021
-VERSION_CODE=750
+#Thu Jan 14 18:10:27 CST 2021
+VERSION_CODE=751