From: snickersun <scy@incartech.cn>
Date: Wed, 16 Dec 2020 11:22:52 +0000 (+0800)
Subject: 添加体温换算
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=208595d4576acc7166efa198b06cdc5d441b314c;p=protocol_srv.git

添加体温换算
---

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 969be7e5..7a4df3d7 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
@@ -113,8 +113,16 @@ public class TemperatureUtil {
                     //具体可以点击进去看里面的代码。
                     TemperatureItem temperatureItem = TempAlgUtil.doTempTest();
                     if (temperatureItem != null) {
-                        body_temp = Float.parseFloat(temperatureItem.getBodyTemp());
+                        wrist_temp = Float.parseFloat(temperatureItem.getBodyTemp());
                         temout = Float.parseFloat(temperatureItem.getEvnTemp());
+                        if (temout > 60 || temout < 1) {
+                            temout = 0.0f;
+                        }
+                        if (temout > 0.0f ) {
+                            body_temp = TemperatureUtil.getBodyTemp(wrist_temp, temout);
+                        } else {
+                            body_temp = TemperatureUtil.getBodyTemp(wrist_temp, 26.0f);
+                        }
                     } else {
                         ICLogger.log(TAG, "temperatureItem is null...");
                         if (Config.disableWristTemp) {