From: SnickerSun Date: Sat, 25 Sep 2021 15:34:42 +0000 (+0800) Subject: release protocolV2 V903 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=2bb82a0191b1e8a476af53f3c1cde21acf753278;p=icsupport.git release protocolV2 V903 L004PT 剪断状态和未佩戴状态都不进行 心率和体温检测 --- diff --git a/app/release/ICSer_V902_2109252319_release.apk b/app/release/ICSer_V903_2109252333_release.apk similarity index 77% rename from app/release/ICSer_V902_2109252319_release.apk rename to app/release/ICSer_V903_2109252333_release.apk index 57bc709d..a3aba093 100644 Binary files a/app/release/ICSer_V902_2109252319_release.apk and b/app/release/ICSer_V903_2109252333_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 16286fd2..df794409 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -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 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 13d6a9c3..51a36c18 100644 --- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java @@ -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; } } diff --git a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java index 3fa9fc12..8f0924f4 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java @@ -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(() -> { diff --git a/app/version_code.properties b/app/version_code.properties index ef39e4e2..4843355e 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Sat Sep 25 23:19:04 CST 2021 -VERSION_CODE=902 +#Sat Sep 25 23:33:45 CST 2021 +VERSION_CODE=903