release protocolV2 V903
authorSnickerSun <scy@incartech.cn>
Sat, 25 Sep 2021 15:34:42 +0000 (23:34 +0800)
committerSnickerSun <scy@incartech.cn>
Sat, 25 Sep 2021 15:34:42 +0000 (23:34 +0800)
L004PT
剪断状态和未佩戴状态都不进行 心率和体温检测

app/release/ICSer_V903_2109252333_release.apk [moved from app/release/ICSer_V902_2109252319_release.apk with 77% similarity]
app/release/output.json
app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
app/version_code.properties

similarity index 77%
rename from app/release/ICSer_V902_2109252319_release.apk
rename to app/release/ICSer_V903_2109252333_release.apk
index 57bc709..a3aba09 100644 (file)
Binary files a/app/release/ICSer_V902_2109252319_release.apk and b/app/release/ICSer_V903_2109252333_release.apk differ
index 16286fd..df79440 100644 (file)
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":902,"versionName":"2109252319","enabled":true,"outputFile":"ICSer_V902_2109252319_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V902_2109252319_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":903,"versionName":"2109252333","enabled":true,"outputFile":"ICSer_V903_2109252333_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V903_2109252333_release.apk","properties":{}}]
\ No newline at end of file
index 13d6a9c..51a36c1 100644 (file)
@@ -297,8 +297,8 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
 
     public void triggerPPGTest(int from) {
         if (CoreService.getInstance() != null) {
-            if (CoreService.getInstance().getRuntime().Anti_off_flag == 1) {
-                ICLogger.i("未佩戴,取消 triggerPPGtest!");
+            if (CoreService.getInstance().getRuntime().Anti_off_flag == 1 || CoreService.getInstance().getRuntime().Cut_off_flag == 1) {
+                ICLogger.i("未佩戴 or 剪断,取消 triggerPPGtest!");
                 return;
             }
         }
index 3fa9fc1..8f0924f 100644 (file)
@@ -164,8 +164,8 @@ public class TemperatureUtil {
      */
     public void DoTempTest(int from) {
         ICLogger.d("DoTempTest..." + from);
-        if (CoreService.getInstance() != null && CoreService.getInstance().getRuntime().Anti_off_flag == 1) {
-            ICLogger.i("未佩戴,取消TempTest!" + from);
+        if (CoreService.getInstance() != null && (CoreService.getInstance().getRuntime().Anti_off_flag == 1 ||CoreService.getInstance().getRuntime().Cut_off_flag == 1 ) ) {
+            ICLogger.i("未佩戴 or 剪断,取消TempTest!" + from);
             return;
         }
         new Thread(() -> {
index ef39e4e..4843355 100644 (file)
@@ -1,2 +1,2 @@
-#Sat Sep 25 23:19:04 CST 2021\r
-VERSION_CODE=902\r
+#Sat Sep 25 23:33:45 CST 2021\r
+VERSION_CODE=903\r