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

添加体温换算
---

diff --git a/app/src/main/java/com/ic/work/hardware/TemperatureRunnable.java b/app/src/main/java/com/ic/work/hardware/TemperatureRunnable.java
index b9d7669..353814a 100644
--- a/app/src/main/java/com/ic/work/hardware/TemperatureRunnable.java
+++ b/app/src/main/java/com/ic/work/hardware/TemperatureRunnable.java
@@ -34,8 +34,17 @@ public class TemperatureRunnable implements Runnable {
                     lastWristTemp = HardwareUtils.getNdkTemperatureOutValue();
                     TemperatureItem temperatureItem = TemperatureUtil.doTempTest();
                     if (temperatureItem != null) {
-                        lastBodyTemp = Double.parseDouble(temperatureItem.getBodyTemp());
+                        lastWristTemp = Double.parseDouble(temperatureItem.getBodyTemp());
                         lastTempOut = Double.parseDouble(temperatureItem.getEvnTemp());
+
+                        if (lastTempOut > 60 || lastTempOut < 1) {
+                            lastTempOut = 0.0f;
+                        }
+                        if (lastTempOut > 0.0f ) {
+                            lastBodyTemp = TemperatureUtil.getBodyTemp(lastWristTemp, lastTempOut);
+                        } else {
+                            lastBodyTemp = TemperatureUtil.getBodyTemp(lastWristTemp, 26.0f);
+                        }
                         //获取
                         EventBus.getDefault().post(new TemperatureResultEvent(lastWristTemp,
                                 lastBodyTemp, lastTempOut));
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 126991c..7f8fa80 100644
--- a/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
@@ -34,7 +34,9 @@ public class TemperatureUtil {
         }
 
     }
-
+    public static double getBodyTemp(double wristtemp, double envtemp) {
+         return ICJniUtils.getBodyTempFromWristTemp(wristtemp, envtemp);
+    }
     public static void disableTemp() {
         if (ICJniUtils.isTemperatureDevAvailable() > ICJniUtils.TempSensorType.TEMPSENSOR_TYPE_NONE.ordinal()) {
             ICJniUtils.disableTemperature();