release new verstion to update envTemp algorithm

diff --git a/app/IcL02WorkService/release/IcL02WorkService_V57_202012171724_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V57_202012211008_release.apk
similarity index 70%
rename from app/IcL02WorkService/release/IcL02WorkService_V57_202012171724_release.apk
rename to app/IcL02WorkService/release/IcL02WorkService_V57_202012211008_release.apk
index c2da0e6..e98ffd9 100644 (file)
Binary files a/app/IcL02WorkService/release/IcL02WorkService_V57_202012171724_release.apk and b/app/IcL02WorkService/release/IcL02WorkService_V57_202012211008_release.apk differ

diff --git a/app/IcL02WorkService/release/output.json b/app/IcL02WorkService/release/output.json
index 7f10ed2..9d6109a 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_V57_202012171724_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V57_202012171724_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_V57_202012211008_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V57_202012211008_release.apk","properties":{}}]
\ No newline at end of file

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 e7edd44..0e75137 100644 (file)
--- a/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
@@ -141,16 +141,17 @@ public class TemperatureUtil {
             String envDy = IcSystemProperty.getSystemProperties("persist.sys.envAlgDy", "");
             IcLog.d(TAG, "envSlope == > " + envSlope + " envDy == >  " + envDy);
             double resultEnvTemp = evnTemp;
-            if (!TextUtils.isEmpty(envDy) && !TextUtils.isEmpty(envSlope) && boardTemp > 45) {
+            if (!TextUtils.isEmpty(envDy) && !TextUtils.isEmpty(envSlope) && boardTemp > 39) {
                 //进行换算
                 IcLog.d(TAG, "env temp with board temp...");
                 resultEnvTemp = evnTemp - (Float.parseFloat(envSlope) * boardTemp + Float.parseFloat(envDy));
-            } else if (boardTemp <= 45 && boardTemp >= 32) {
-                IcLog.d(TAG, "in range of 32 to 38");
+                // resultEnvTemp = evnTemp - (0.8492 * boardTemp - 25.204);
+            } else if (boardTemp <= 39 && boardTemp >= 27) {
+                IcLog.d(TAG, "in range of 27 to 39");
                 //Ut = St-(Bt*0.869-27.167) Bt∈[32，38)
-                resultEnvTemp = evnTemp - (0.869 * boardTemp - 27.167);
+                resultEnvTemp = evnTemp - (0.2441 * boardTemp - 2.3248);
             } else {
-                //TODO:主板温度低于32度的，如果测试有这样的case，再采集数据
+                //TODO:主板温度低于27度的，如果测试有这样的case，再采集数据
             }
 
             String bodySlope = IcSystemProperty.getSystemProperties("persist.sys.bodyAlgSlope", "");