添加体温换算

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 969be7e..7a4df3d 100644 (file)
--- 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) {