From: TrillGates <williamtrillgates@gmail.com>
Date: Mon, 10 May 2021 07:26:51 +0000 (+0800)
Subject: fixed temperature value issues.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=d51e92b62ef644c08ccced34c733d1dffcd070a2;p=icworkservice.git

fixed temperature value issues.
---

diff --git a/app/IcL02WorkService/release/IcL02WorkService_V58_202105101445_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V58_202105101445_release.apk
new file mode 100644
index 0000000..1abaa4a
Binary files /dev/null and b/app/IcL02WorkService/release/IcL02WorkService_V58_202105101445_release.apk differ
diff --git a/app/IcL02WorkService/release/output.json b/app/IcL02WorkService/release/output.json
index 2314bf3..b8260c6 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_V58_202105072112_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V58_202105072112_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_V58_202105101445_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V58_202105101445_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/work/hardware/TemperatureHelper.java b/app/src/main/java/com/ic/work/hardware/TemperatureHelper.java
index 6ebd714..0e96279 100644
--- a/app/src/main/java/com/ic/work/hardware/TemperatureHelper.java
+++ b/app/src/main/java/com/ic/work/hardware/TemperatureHelper.java
@@ -77,11 +77,6 @@ public class TemperatureHelper {
                     if (lastTempOut > 60 || lastTempOut < 1) {
                         lastTempOut = 0.0f;
                     }
-                    if (lastTempOut > 0.0f) {
-                        lastBodyTemp = TemperatureUtil.getBodyTemp(lastWristTemp, lastTempOut);
-                    } else {
-                        lastBodyTemp = TemperatureUtil.getBodyTemp(lastWristTemp, 26.0f);
-                    }
                     IcLog.d(TAG, "testing..." + lastWristTemp + " " + lastBodyTemp + " " + lastTempOut);
                     //前10秒不更新内容，后10秒再更新数据
                     if (delayTimesInSeconds <= 10 && mListener != null) {
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 af1cd3f..f47f10f 100644
--- a/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
@@ -99,29 +99,37 @@ public class TemperatureUtil {
             String property = Utils.getSystemProperties("persist.sys.id_num", null);
             double resultEnvTemp = -100;
             double resultBodyTemp = 0;
+            ICLogger.d("property  == > " + property);
+            double lastBodyTemp = 0.0;
             if ("l004pt".equals(property)) {
                 double bodyTempResult = AlgorithmUtils.l004Pt(bodyTemp, evnTemp);
+                ICLogger.d("bodyTempResult == > " + bodyTempResult);
                 if (bodyTempResult != -1) {
                     //越接近34.1越准确
                     ICLogger.d("bodyTempResult == > " + bodyTempResult);
-                    resultBodyTemp = getBodyTemp(bodyTempResult, 26.1f);
-                    ICLogger.d("final body temp == > " + resultBodyTemp);
+                    lastBodyTemp = getBodyTemp(bodyTempResult, 26.1f);
+                    ICLogger.d("final body temp == > " + lastBodyTemp);
                 }
             } else if ("q3ft".equals(property)) {
                 resultEnvTemp = AlgorithmUtils.s123GetEnvData(evnTemp, boardTemp);
                 resultBodyTemp = AlgorithmUtils.s123GetBodyTemp(bodyTemp, boardTemp);
+                if (resultEnvTemp > 0.0f) {
+                    lastBodyTemp = TemperatureUtil.getBodyTemp(resultBodyTemp, resultEnvTemp);
+                } else {
+                    lastBodyTemp = TemperatureUtil.getBodyTemp(resultBodyTemp, 26.0f);
+                }
 
                 IcLog.d(TAG, "evnTemp == > " + evnTemp + " resultEnvTemp = >  " + resultEnvTemp);
-                IcLog.d(TAG, "bodyTemp == > " + bodyTemp + " resultBodyTemp = >  " + resultBodyTemp);
+                IcLog.d(TAG, "bodyTemp == > " + bodyTemp + " resultBodyTemp = >  " + lastBodyTemp);
             }
 
-            if (resultBodyTemp <= 0) {
+            if (lastBodyTemp <= 0) {
                 return null;
             }
             try {
                 //发送消息给launcher显示
                 TemperatureItem temperatureItem = new TemperatureItem(
-                        String.format("%.01f", resultBodyTemp),
+                        String.format("%.01f", lastBodyTemp),
                         String.format("%.01f", cpuTemp),
                         String.format("%.01f", resultEnvTemp),
                         String.format("%.01f", gpuTemp),