From dd27bf55e952b0bb4822df754bf92e8dde495ab5 Mon Sep 17 00:00:00 2001 From: TrillGates Date: Thu, 19 Aug 2021 16:47:40 +0800 Subject: [PATCH] update translation. --- .../enqualcomm/support/bean/TemperatureInfo.java | 14 ++++++++++---- app/src/main/res/values-ja/strings.xml | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java b/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java index 59074858..ae89b163 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java +++ b/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java @@ -1,5 +1,7 @@ package com.enqualcomm.support.bean; +import com.enqualcomm.support.utils.ICLogger; + public class TemperatureInfo { public double currentBodyTemp; @@ -8,8 +10,8 @@ public class TemperatureInfo { public String measureTime; public double bodyTempThresholdMax = 0; public double bodyTempThresholdMin = 0; - private double workMax = 0; - private double workMin = 0; + private double workMax = 1000; + private double workMin = -1000; public void setBodyTempThreshold(double max, double min, double workMax, double workMin) { bodyTempThresholdMax = max; @@ -30,13 +32,17 @@ public class TemperatureInfo { * @return 0 normal , 1 过高,2 过低,3环境温度过高,4环境温度过低 */ public int isBodyTempAbnormal() { + ICLogger.d("bodyTempThresholdMax == > " + bodyTempThresholdMax); + ICLogger.d("bodyTempThresholdMin == > " + bodyTempThresholdMin); + ICLogger.d("workMax == > " + workMax); + ICLogger.d("workMax == > " + workMax); if (bodyTempThresholdMax > 0 && currentBodyTemp > bodyTempThresholdMax) { return 1; } else if (bodyTempThresholdMin > 0 && currentBodyTemp < bodyTempThresholdMin) { return 2; - } else if (workMax != -1 && currentWristTempOut > workMax) { + } else if (workMax != 1000 && currentWristTempOut > workMax) { return 3; - } else if (workMin != -1 && currentWristTempOut < workMin) { + } else if (workMax != -1000 && currentWristTempOut < workMin) { return 4; } else { return 0; diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e00afc79..c8d5a574 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -155,13 +155,13 @@ 心拍異常(BPM 血圧異常( 体温異常( - SMS通知 + 通知 シャットダウン 低電力アラート 緊急SOS %sからSOSが発信されました。%s 既読 - 回复 + 返信 送信失败 送信成功 戻る -- 2.17.1