update algorthm and release IcL02WorkService_V59_202109271624_release

diff --git a/app/IcL02WorkService/release/IcL02WorkService_V59_202109271611_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V59_202109271611_release.apk
deleted file mode 100644 (file)
index 909746d..0000000
Binary files a/app/IcL02WorkService/release/IcL02WorkService_V59_202109271611_release.apk and /dev/null differ

diff --git a/app/IcL02WorkService/release/IcL02WorkService_V59_202109271624_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V59_202109271624_release.apk
new file mode 100644 (file)
index 0000000..22b69e0
Binary files /dev/null and b/app/IcL02WorkService/release/IcL02WorkService_V59_202109271624_release.apk differ

diff --git a/app/IcL02WorkService/release/output.json b/app/IcL02WorkService/release/output.json
index e0b01cf..abc1779 100644 (file)
--- a/app/IcL02WorkService/release/output.json
+++ b/app/IcL02WorkService/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1","enabled":true,"outputFile":"IcL02WorkService_V59_202109271611_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V59_202109271611_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1","enabled":true,"outputFile":"IcL02WorkService_V59_202109271624_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V59_202109271624_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/work/utils/AlgorithmUtils.java b/app/src/main/java/com/ic/work/utils/AlgorithmUtils.java
index 9e75de4..9dd0df3 100644 (file)
--- a/app/src/main/java/com/ic/work/utils/AlgorithmUtils.java
+++ b/app/src/main/java/com/ic/work/utils/AlgorithmUtils.java
@@ -139,7 +139,8 @@ public class AlgorithmUtils {
 
     private int zeroTime = 0;
 
-    public double MW13C(double wristTemp, double boardTemp, double batteryTemp) throws TempValueException {
+    public double MW13C(double wristTemp,
+                        double boardTemp, double batteryTemp,double envTemp) throws TempValueException {
         if (wristTemp == 0.0) {
             zeroTime++;
             return 0.0;
@@ -173,7 +174,7 @@ public class AlgorithmUtils {
         //}
 
         //对主板温度值进行检查
-        if (boardTemp > 53.4) {
+        if (envTemp > 37.2f) {
             throw new TempValueException(
                     mContext.getString(R.string.board_temperature_high_text) + ":" + boardTemp,
                     ERROR_HARD_WEAR_TOO_HIGH);

diff --git a/app/src/main/java/com/ic/work/utils/TemperatureUtil.java b/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
index b9ca0cb..a6a639f 100644 (file)
--- a/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
@@ -155,7 +155,7 @@ public class TemperatureUtil {
                 }
             } else if ("MW13C".equals(property)) {
                 wristTemp = AlgorithmUtils.getInstance(WorkServiceApp.sContext).MW13C(wristTemp,
-                        boardTemp, batteryTemp);
+                        boardTemp, batteryTemp,envTemp);
                 if (wristTemp == 0) {
                     return null;
                 }