release ICSer_V1014_2112031558_release

diff --git a/app/release/ICSer_V1013_2112031430_release.apk b/app/release/ICSer_V1014_2112031558_release.apk
similarity index 77%
rename from app/release/ICSer_V1013_2112031430_release.apk
rename to app/release/ICSer_V1014_2112031558_release.apk
index bd49cd2..ca70c49 100644 (file)
Binary files a/app/release/ICSer_V1013_2112031430_release.apk and b/app/release/ICSer_V1014_2112031558_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 623f803..7da87a8 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1013,"versionName":"2112031430","enabled":true,"outputFile":"ICSer_V1013_2112031430_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V1013_2112031430_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1014,"versionName":"2112031558","enabled":true,"outputFile":"ICSer_V1014_2112031558_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V1014_2112031558_release.apk","properties":{}}]
\ No newline at end of file

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 39a119f..6aaded8 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -86,7 +86,6 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
 
         //bpl
         if (runtime.getHRS().bpl_threshold_max > 0 && runtime.getHRS().getBPL() > runtime.getHRS().bpl_threshold_max) {
-
             if (runtime.setAlarmType(Runtime.AlarmType.ALARM_BPL_HIGH)) {
                 //trigger AP10 报警定位
                 ICLogger.i("triggerSOSLocationProcess ");
@@ -177,6 +176,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
             //判断是否有超出阀值
             //如果超出的话，插入一条警告通知
             //如果数据为0，不处理
+            //S123才需要以下的处理
             checkHeartRateValue(heartRate);
             runtime.getHRS().setHeartrateStat(heartRateStatus.HEARTRATE_WORKINGSTAT.HEARTRATE_TEST_SUCCESS);
             runtime.getHRS().setLastHeartrate(heartRate.getHeartRate(), heartRate.getBloodHeight(), heartRate.getBloodLow(), heartRate.getOxygen());
@@ -209,6 +209,10 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
                 + " bloodLowValue ==> " + bloodLowValue
                 + " heartRateValue ==> " + heartRateValue
         );
+        if (Config.protocol_no == Config.PROTOCOL_S123 && heartRate.getHeartRate() < 60) {
+            ICLogger.d("S123的心率小于60，不做通知");
+            return;
+        }
         Context context = runtime.getContextProxy().context;
 
         ICLogger.d("Config.LIMIT_VALUE_OXYGEN ==> " + Config.LIMIT_VALUE_OXYGEN

diff --git a/app/version_code.properties b/app/version_code.properties
index 6439c27..9e7f567 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Dec 03 14:30:25 CST 2021\r
-VERSION_CODE=1013\r
+#Fri Dec 03 15:58:11 CST 2021\r
+VERSION_CODE=1014\r