From 9895cb328186b799a836d5ff71f5f7586e013cc0 Mon Sep 17 00:00:00 2001 From: snickersun Date: Wed, 16 Dec 2020 19:22:34 +0800 Subject: [PATCH] =?utf8?q?=E6=B7=BB=E5=8A=A0=E4=BD=93=E6=B8=A9=E6=8D=A2?= =?utf8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../com/ic/work/hardware/TemperatureRunnable.java | 11 ++++++++++- .../main/java/com/ic/work/utils/TemperatureUtil.java | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) 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(); -- 2.17.1