From: kfl_614 <kfl_614@163.com>
Date: Thu, 17 Dec 2020 09:42:18 +0000 (+0800)
Subject: optimize temperature data.
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=f1b1e4c3d6a113a67cb1010dbc1b95d822191967;p=icworkservice.git

optimize temperature data.
---

diff --git a/app/IcL02WorkService/release/IcL02WorkService_V57_202012161928_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V57_202012161928_release.apk
deleted file mode 100644
index f680e09..0000000
Binary files a/app/IcL02WorkService/release/IcL02WorkService_V57_202012161928_release.apk and /dev/null differ
diff --git a/app/IcL02WorkService/release/IcL02WorkService_V57_202012171724_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V57_202012171724_release.apk
new file mode 100644
index 0000000..c2da0e6
Binary files /dev/null and b/app/IcL02WorkService/release/IcL02WorkService_V57_202012171724_release.apk differ
diff --git a/app/IcL02WorkService/release/output.json b/app/IcL02WorkService/release/output.json
index 0650901..7f10ed2 100644
--- 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_202012161928_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V57_202012161928_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_202012171724_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V57_202012171724_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/work/WorkService.java b/app/src/main/java/com/ic/work/WorkService.java
index b9c5852..e1aca62 100644
--- a/app/src/main/java/com/ic/work/WorkService.java
+++ b/app/src/main/java/com/ic/work/WorkService.java
@@ -419,6 +419,9 @@ public class WorkService extends Service {
     public void onMessageEvent(TemperatureResultCompleteEvent event) {
         sendTempBroadcast(event.value, event.animal, event.tempOut);
         if (tempProcess != null) {
+            IcLog.d(TAG, "lastWristTemp == > " + event.value);
+            IcLog.d(TAG, "bodyTemp == > " + event.animal);
+            IcLog.d(TAG, "envTemp == > " + event.tempOut);
             tempProcess.sendResultTempValue(event.value, event.animal, event.tempOut);
         }
 
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 0491261..e7edd44 100644
--- a/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
@@ -141,11 +141,11 @@ 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 > 38) {
+            if (!TextUtils.isEmpty(envDy) && !TextUtils.isEmpty(envSlope) && boardTemp > 45) {
                 //进行换算
                 IcLog.d(TAG, "env temp with board temp...");
                 resultEnvTemp = evnTemp - (Float.parseFloat(envSlope) * boardTemp + Float.parseFloat(envDy));
-            } else if (boardTemp <= 38 && boardTemp >= 32) {
+            } else if (boardTemp <= 45 && boardTemp >= 32) {
                 IcLog.d(TAG, "in range of 32 to 38");
                 //Ut = St-(Bt*0.869-27.167) Bt∈[32，38)
                 resultEnvTemp = evnTemp - (0.869 * boardTemp - 27.167);