fixed s123 tempearture wearning notification issues.

diff --git a/app/release/ICSer_V939_2109031043_release.apk b/app/release/ICSer_V940_2109031442_release.apk
similarity index 77%
rename from app/release/ICSer_V939_2109031043_release.apk
rename to app/release/ICSer_V940_2109031442_release.apk
index 4182861..5a0befb 100644 (file)
Binary files a/app/release/ICSer_V939_2109031043_release.apk and b/app/release/ICSer_V940_2109031442_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 38dce9e..3fe306a 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":939,"versionName":"2109031043","enabled":true,"outputFile":"ICSer_V939_2109031043_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V939_2109031043_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":940,"versionName":"2109031442","enabled":true,"outputFile":"ICSer_V940_2109031442_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V940_2109031442_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java b/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java
index ae89b16..2026f3f 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java
@@ -34,13 +34,19 @@ public class TemperatureInfo {
     public int isBodyTempAbnormal() {
         ICLogger.d("bodyTempThresholdMax == > " + bodyTempThresholdMax);
         ICLogger.d("bodyTempThresholdMin == > " + bodyTempThresholdMin);
-        ICLogger.d("workMax == > " + workMax);
-        ICLogger.d("workMax == > " + workMax);
         if (bodyTempThresholdMax > 0 && currentBodyTemp > bodyTempThresholdMax) {
             return 1;
         } else if (bodyTempThresholdMin > 0 && currentBodyTemp < bodyTempThresholdMin) {
             return 2;
-        } else if (workMax != 1000 && currentWristTempOut > workMax) {
+        } else {
+            return 0;
+        }
+    }
+
+    public int checkWorkTemp() {
+        ICLogger.d("workMax == > " + workMax);
+        ICLogger.d("workMax == > " + workMax);
+        if (workMax != 1000 && currentWristTempOut > workMax) {
             return 3;
         } else if (workMax != -1000 && currentWristTempOut < workMin) {
             return 4;

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 ccdb6e9..f84e17b 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
@@ -148,14 +148,18 @@ public class TemperatureUtil {
                                 .getString(R.string.body_temperature_exception_tips_text)
                                 + temperature.getBodyTemp() + "℃)", "body_temperature",
                         Constants.WARNING_MSG_TYPE_BODY_TEMP);
-            } else if (resultCode == 3) {
+            }
+            
+            int workEnvResultCode = runtime.tempInfo.checkWorkTemp();
+
+            if (workEnvResultCode == 3) {
                 //创建警告信息
                 createWarningNotification(
                         CoreService.getInstance().getRuntime().getContextProxy().context
                                 .getString(R.string.out_temp_too_high_text)
                                 + temperature.getEnvTemp() + "℃)", "env_temperature",
                         Constants.WARNING_MSG_TYPE_ENV_TEMP);
-            } else if (resultCode == 4) {
+            } else if (workEnvResultCode == 4) {
                 //创建警告信息
                 createWarningNotification(
                         CoreService.getInstance().getRuntime().getContextProxy().context

diff --git a/app/version_code.properties b/app/version_code.properties
index 540df4e..fa59cef 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Sep 03 10:43:43 CST 2021\r
-VERSION_CODE=939\r
+#Fri Sep 03 14:42:46 CST 2021\r
+VERSION_CODE=940\r