completed s123 temperature parse.

diff --git a/app/release/ICSer_V913_2108141818_release.apk b/app/release/ICSer_V914_2108141935_release.apk
similarity index 76%
rename from app/release/ICSer_V913_2108141818_release.apk
rename to app/release/ICSer_V914_2108141935_release.apk
index 3fb7fab..4568bd5 100644 (file)
Binary files a/app/release/ICSer_V913_2108141818_release.apk and b/app/release/ICSer_V914_2108141935_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 0a485e2..c43d146 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":913,"versionName":"2108141818","enabled":true,"outputFile":"ICSer_V913_2108141818_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V913_2108141818_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":914,"versionName":"2108141935","enabled":true,"outputFile":"ICSer_V914_2108141935_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V914_2108141935_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 03ff6db..c3a761d 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -98,15 +98,17 @@ public class Config {
     //1、服务起来的时候，从数据库中读取记录阀值
     //2、当阀值更新的时候，更新数据的同时，也更新以下的值
     //保存到这里来，方便使用，不需要每次去查询
-    public static int LIMIT_VALUE_PPGH = 0;
-    public static int LIMIT_VALUE_PPGL = 0;
-    public static int LIMIT_VALUE_BPH_H = 0;
-    public static int LIMIT_VALUE_BPH_L = 0;
-    public static int LIMIT_VALUE_BPL_H = 0;
-    public static int LIMIT_VALUE_BPL_L = 0;
-    public static int LIMIT_VALUE_OXYGEN = 0;
-    public static int LIMIT_VALUE_TEMPERATURE_TOP = 0;
-    public static int LIMIT_VALUE_TEMPERATURE_BOTTOM = 0;
+    public static float LIMIT_VALUE_PPGH = 0;
+    public static float LIMIT_VALUE_PPGL = 0;
+    public static float LIMIT_VALUE_BPH_H = 0;
+    public static float LIMIT_VALUE_BPH_L = 0;
+    public static float LIMIT_VALUE_BPL_H = 0;
+    public static float LIMIT_VALUE_BPL_L = 0;
+    public static float LIMIT_VALUE_OXYGEN = 0;
+    public static float LIMIT_VALUE_TEMPERATURE_TOP = 0;
+    public static float LIMIT_VALUE_TEMPERATURE_BOTTOM = 0;
+    public static float LIMIT_VALUE_WORK_TEMPERATURE_TOP = 0;
+    public static float LIMIT_VALUE_WORK_TEMPERATURE_BOTTOM = 0;
     //add by TrillGates=================end
 
 

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 217d7a5..10598b9 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -1064,64 +1064,81 @@ public class CoreService extends Service {
      * 值保存到config里去
      */
     private void loadLimitValue() {
-        String heartRateBottomLimitValue =
-                getICSettingsValue("heart_rate_bottom_limit_value");
-        ICLogger.d("heartRateBottomLimitValue == > "
-                + heartRateBottomLimitValue);
-        if (!TextUtils.isEmpty(heartRateBottomLimitValue)) {
-            Config.LIMIT_VALUE_PPGH = Integer.parseInt(heartRateBottomLimitValue);
-        }
-        String heartRateTopLimitValue =
-                getICSettingsValue("heart_rate_top_limit_value");
-        ICLogger.d("heartRateTopLimitValue == > " + heartRateTopLimitValue);
-        if (!TextUtils.isEmpty(heartRateTopLimitValue)) {
-            Config.LIMIT_VALUE_PPGL = Integer.parseInt(heartRateTopLimitValue);
-        }
-        String bloodPressureHighTopLimitValue =
-                getICSettingsValue("blood_pressure_high_top_limit_value");
-        ICLogger.d("bloodPressureHighTopLimitValue == > "
-                + bloodPressureHighTopLimitValue);
-        if (!TextUtils.isEmpty(bloodPressureHighTopLimitValue)) {
-            Config.LIMIT_VALUE_BPH_H = Integer.parseInt(bloodPressureHighTopLimitValue);
-        }
-        String bloodPressureHighBottomLimitValue =
-                getICSettingsValue("blood_pressure_high_bottom_limit_value");
-        ICLogger.d("bloodPressureHighBottomLimitValue == > "
-                + bloodPressureHighBottomLimitValue);
-        if (!TextUtils.isEmpty(bloodPressureHighBottomLimitValue)) {
-            Config.LIMIT_VALUE_BPH_L = Integer.parseInt(bloodPressureHighBottomLimitValue);
-        }
-        String bloodPressureLowTopLimitValue =
-                getICSettingsValue("blood_pressure_low_top_limit_value");
-        ICLogger.d("bloodPressureLowTopLimitValue == > "
-                + bloodPressureLowTopLimitValue);
-        if (!TextUtils.isEmpty(bloodPressureLowTopLimitValue)) {
-            Config.LIMIT_VALUE_BPL_H = Integer.parseInt(bloodPressureLowTopLimitValue);
-        }
-        String bloodPressureLowBottomLimitValue =
-                getICSettingsValue("blood_pressure_low_bottom_limit_value");
-        ICLogger.d("bloodPressureLowBottomLimitValue == > "
-                + bloodPressureLowBottomLimitValue);
-        if (!TextUtils.isEmpty(bloodPressureLowBottomLimitValue)) {
-            Config.LIMIT_VALUE_BPL_L = Integer.parseInt(bloodPressureLowBottomLimitValue);
-        }
-        String bloodOxygenLimitValue =
-                getICSettingsValue("blood_oxygen_limit_value");
-        ICLogger.d("bloodOxygenLimitValue == > " + bloodOxygenLimitValue);
-        if (!TextUtils.isEmpty(bloodOxygenLimitValue)) {
-            Config.LIMIT_VALUE_OXYGEN = Integer.parseInt(bloodOxygenLimitValue);
-        }
-        //体温的
-        String bodyTemperatureTopValue = getICSettingsValue("body_temperature_top_value");
-        ICLogger.d("bodyTemperatureTopValue == > " + bodyTemperatureTopValue);
-        if (!TextUtils.isEmpty(bodyTemperatureTopValue)) {
-            Config.LIMIT_VALUE_TEMPERATURE_TOP = Integer.parseInt(bodyTemperatureTopValue);
-        }
-        String bodTemperatureBottomValue =
-                getICSettingsValue("body_temperature_bottom_value");
-        ICLogger.d("body_temperature_bottom_value == > " + bodTemperatureBottomValue);
-        if (!TextUtils.isEmpty(bodTemperatureBottomValue)) {
-            Config.LIMIT_VALUE_TEMPERATURE_BOTTOM = Integer.parseInt(bodTemperatureBottomValue);
+        try {
+
+            String heartRateBottomLimitValue =
+                    getICSettingsValue("heart_rate_bottom_limit_value");
+            ICLogger.d("heartRateBottomLimitValue == > "
+                    + heartRateBottomLimitValue);
+            if (!TextUtils.isEmpty(heartRateBottomLimitValue)) {
+                Config.LIMIT_VALUE_PPGH = Float.parseFloat(heartRateBottomLimitValue);
+            }
+            String heartRateTopLimitValue =
+                    getICSettingsValue("heart_rate_top_limit_value");
+            ICLogger.d("heartRateTopLimitValue == > " + heartRateTopLimitValue);
+            if (!TextUtils.isEmpty(heartRateTopLimitValue)) {
+                Config.LIMIT_VALUE_PPGL = Float.parseFloat(heartRateTopLimitValue);
+            }
+            String bloodPressureHighTopLimitValue =
+                    getICSettingsValue("blood_pressure_high_top_limit_value");
+            ICLogger.d("bloodPressureHighTopLimitValue == > "
+                    + bloodPressureHighTopLimitValue);
+            if (!TextUtils.isEmpty(bloodPressureHighTopLimitValue)) {
+                Config.LIMIT_VALUE_BPH_H = Float.parseFloat(bloodPressureHighTopLimitValue);
+            }
+            String bloodPressureHighBottomLimitValue =
+                    getICSettingsValue("blood_pressure_high_bottom_limit_value");
+            ICLogger.d("bloodPressureHighBottomLimitValue == > "
+                    + bloodPressureHighBottomLimitValue);
+            if (!TextUtils.isEmpty(bloodPressureHighBottomLimitValue)) {
+                Config.LIMIT_VALUE_BPH_L = Float.parseFloat(bloodPressureHighBottomLimitValue);
+            }
+            String bloodPressureLowTopLimitValue =
+                    getICSettingsValue("blood_pressure_low_top_limit_value");
+            ICLogger.d("bloodPressureLowTopLimitValue == > "
+                    + bloodPressureLowTopLimitValue);
+            if (!TextUtils.isEmpty(bloodPressureLowTopLimitValue)) {
+                Config.LIMIT_VALUE_BPL_H = Float.parseFloat(bloodPressureLowTopLimitValue);
+            }
+            String bloodPressureLowBottomLimitValue =
+                    getICSettingsValue("blood_pressure_low_bottom_limit_value");
+            ICLogger.d("bloodPressureLowBottomLimitValue == > "
+                    + bloodPressureLowBottomLimitValue);
+            if (!TextUtils.isEmpty(bloodPressureLowBottomLimitValue)) {
+                Config.LIMIT_VALUE_BPL_L = Float.parseFloat(bloodPressureLowBottomLimitValue);
+            }
+            String bloodOxygenLimitValue =
+                    getICSettingsValue("blood_oxygen_limit_value");
+            ICLogger.d("bloodOxygenLimitValue == > " + bloodOxygenLimitValue);
+            if (!TextUtils.isEmpty(bloodOxygenLimitValue)) {
+                Config.LIMIT_VALUE_OXYGEN = Float.parseFloat(bloodOxygenLimitValue);
+            }
+            //体温的
+            String bodyTemperatureTopValue = getICSettingsValue("body_temperature_top_value");
+            ICLogger.d("bodyTemperatureTopValue == > " + bodyTemperatureTopValue);
+            if (!TextUtils.isEmpty(bodyTemperatureTopValue)) {
+                Config.LIMIT_VALUE_TEMPERATURE_TOP = Float.parseFloat(bodyTemperatureTopValue);
+            }
+            String bodTemperatureBottomValue =
+                    getICSettingsValue("body_temperature_bottom_value");
+            ICLogger.d("body_temperature_bottom_value == > " + bodTemperatureBottomValue);
+            if (!TextUtils.isEmpty(bodTemperatureBottomValue)) {
+                Config.LIMIT_VALUE_TEMPERATURE_BOTTOM = Float.parseFloat(bodTemperatureBottomValue);
+            }
+            String workTemperatureBottomValueTop =
+                    getICSettingsValue("limit_value_work_temperature_top");
+            ICLogger.d("limit_value_work_temperature_top == > " + workTemperatureBottomValueTop);
+            if (!TextUtils.isEmpty(workTemperatureBottomValueTop)) {
+                Config.LIMIT_VALUE_WORK_TEMPERATURE_TOP = Float.parseFloat(workTemperatureBottomValueTop);
+            }
+            String workTemperatureBottomValueBottom =
+                    getICSettingsValue("limit_value_work_temperature_bottom");
+            ICLogger.d("limit_value_work_temperature_bottom == > " + workTemperatureBottomValueBottom);
+            if (!TextUtils.isEmpty(workTemperatureBottomValueBottom)) {
+                Config.LIMIT_VALUE_WORK_TEMPERATURE_BOTTOM = Float.parseFloat(workTemperatureBottomValueBottom);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 

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 0508de0..5907485 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java
@@ -6,30 +6,39 @@ public class TemperatureInfo {
     public double currentWristTemp;
     public double currentWristTempOut;
     public String measureTime;
-    public double bodyTempThresholdMax=0;
-    public double bodyTempThresholdMin=0;
+    public double bodyTempThresholdMax = 0;
+    public double bodyTempThresholdMin = 0;
+    private double workMax = 0;
+    private double workMin = 0;
 
-    public void setBodyTempThreshold(double max,double min){
-        bodyTempThresholdMax=max;
-        bodyTempThresholdMin=min;
+    public void setBodyTempThreshold(double max, double min, double workMax, double workMin) {
+        bodyTempThresholdMax = max;
+        bodyTempThresholdMin = min;
+        this.workMax = workMax;
+        this.workMin = workMin;
     }
 
-    public void setTemp(double bodytemp,double wristtemp,double tempOut){
-        currentBodyTemp=bodytemp;
-        currentWristTemp=wristtemp;
-        currentWristTempOut=tempOut;
+    public void setTemp(double bodytemp, double wristtemp, double tempOut) {
+        currentBodyTemp = bodytemp;
+        currentWristTemp = wristtemp;
+        currentWristTempOut = tempOut;
 
     }
+
     /***
      *
-     * @return 0 normal , 1 过高，2 过低
+     * @return 0 normal , 1 过高，2 过低,3环境温度过高，4环境温度过低
      */
-    public int isBodyTempAbnormal(){
-        if( bodyTempThresholdMax >0 && currentBodyTemp >bodyTempThresholdMax){
+    public int isBodyTempAbnormal() {
+        if (bodyTempThresholdMax > 0 && currentBodyTemp > bodyTempThresholdMax) {
             return 1;
-        }else if (bodyTempThresholdMin>0 && currentBodyTemp < bodyTempThresholdMin){
+        } else if (bodyTempThresholdMin > 0 && currentBodyTemp < bodyTempThresholdMin) {
             return 2;
-        }else {
+        } else if (workMax != -1 && currentWristTempOut > workMax) {
+            return 3;
+        } else if (workMin != -1 && currentWristTempOut < workMin) {
+            return 4;
+        } else {
             return 0;
         }
     }

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 6a78796..530821b 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
@@ -147,6 +147,18 @@ public class TemperatureUtil {
                         CoreService.getInstance().getRuntime().getContextProxy().context
                                 .getString(R.string.body_temperature_exception_tips_text)
                                 + temperature.getBodyTemp() + "℃)", "body_temperature");
+            } else if (resultCode == 3) {
+                //创建警告信息
+                createWarningNotification(
+                        CoreService.getInstance().getRuntime().getContextProxy().context
+                                .getString(R.string.out_temp_too_high_text)
+                                + temperature.getBodyTemp() + "℃)", "body_temperature");
+            } else if (resultCode == 4) {
+                //创建警告信息
+                createWarningNotification(
+                        CoreService.getInstance().getRuntime().getContextProxy().context
+                                .getString(R.string.out_temp_too_low_text)
+                                + temperature.getBodyTemp() + "℃)", "body_temperature");
             }
         }
     }

diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index 82b4bee..56d54d7 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -2191,7 +2191,8 @@ public class protocol_ic {
                 connection.send(APDG(index));
                 if (Integer.parseInt(switch_on) == 1) {
                     ICLogger.i("Handle BPDG index " + index + ", 体温报警阈值开 min=" + min_temp + ",max=" + max_temp);
-                    runtime.tempInfo.setBodyTempThreshold(Double.valueOf(max_temp), Double.valueOf(min_temp));
+                    runtime.tempInfo.setBodyTempThreshold(Double.valueOf(max_temp),
+                            Double.valueOf(min_temp),-1,-1);
                     Config.needTemperature_abnormal_alarm = true;
                 } else {
                     ICLogger.i("Handle BPDG index " + index + ", 体温报警阈值关 ");

diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java
index 2251406..d5e0467 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_s123.java
+++ b/app/src/main/java/com/ic/protocols/protocol_s123.java
@@ -2123,59 +2123,62 @@ public class protocol_s123 {
     }
 
     public void handleBP89(String cmd, Connection connection) {
-
-        //示例：
-        //IWBP89, 353456789012345, 080835,50,90,80,90,110,140,95#
-        //说明：
-        //IW：标识符
-        //BP89 : 命令字符
-        //353456789012345:IMEI号，设备唯一ID
-        //080835 :指令流水号
-        //50: 心率低阀值，低于该阀值上传心率，如果未设置，则留空
-        //90: 心率高阀值，高于该阀值上传心率，如果未设置，则留空
-        //80: 血压低压阀值，低压低于该阀值上传血压，如果未设置，则留空
-        //90: 血压低压阀值，低压高于该阀值上传血压，如果未设置，则留空
-        //110: 血压高压阀值，高压低于该阀值上传血压，如果未设置，则留空
-        //140: 血压高压阀值，高压高于该阀值上传血压，如果未设置，则留空
-        //95 血氧阈值，低于该阈值终端立即显示报警，并上传血氧消息，如果未设置，则留空（新增）
-        String[] list = cmd.split(CMDSPLIT);
-        if (list.length == 10) {
-            String index = list[2];
-            String PPGH = list[3];
-            String PPGL = list[4];
-            String BPH_H = list[5];
-            String BPH_L = list[6];
-            String BPL_H = list[7];
-            String BPL_L = list[8];
-            String OXYGEN = list[9];
-            connection.send(AP89(index));
-            ICLogger.i("收到服务器指令：心率/血压阀值 "
-                    + PPGH + ","
-                    + PPGL + ","
-                    + BPH_H + ","
-                    + BPH_L + ","
-                    + BPL_H + ","
-                    + BPL_L + ","
-                    + OXYGEN);
-            //保存记录到全局设置中
-            //每次测完血压/血氧/心率进行比对
-            //如果超出了阀值，那么就创建警告通知
-            updateIcSettingsValue("heart_rate_bottom_limit_value", PPGH);
-            updateIcSettingsValue("heart_rate_top_limit_value", PPGL);
-            updateIcSettingsValue("blood_pressure_low_bottom_limit_value", BPL_L);
-            updateIcSettingsValue("blood_pressure_low_top_limit_value", BPL_H);
-            updateIcSettingsValue("blood_pressure_high_bottom_limit_value", BPH_L);
-            updateIcSettingsValue("blood_pressure_high_top_limit_value", BPH_H);
-            updateIcSettingsValue("blood_oxygen_limit_value", OXYGEN);
-            Config.LIMIT_VALUE_PPGH = Integer.parseInt(PPGH);
-            Config.LIMIT_VALUE_PPGL = Integer.parseInt(PPGL);
-            Config.LIMIT_VALUE_BPH_H = Integer.parseInt(BPH_H);
-            Config.LIMIT_VALUE_BPH_L = Integer.parseInt(BPH_L);
-            Config.LIMIT_VALUE_BPL_H = Integer.parseInt(BPL_H);
-            Config.LIMIT_VALUE_BPL_L = Integer.parseInt(BPL_L);
-            Config.LIMIT_VALUE_OXYGEN = Integer.parseInt(OXYGEN);
-        } else {
-            ICLogger.i("BP89 format error!");
+        try {
+            //示例：
+            //IWBP89, 353456789012345, 080835,50,90,80,90,110,140,95#
+            //说明：
+            //IW：标识符
+            //BP89 : 命令字符
+            //353456789012345:IMEI号，设备唯一ID
+            //080835 :指令流水号
+            //50: 心率低阀值，低于该阀值上传心率，如果未设置，则留空
+            //90: 心率高阀值，高于该阀值上传心率，如果未设置，则留空
+            //80: 血压低压阀值，低压低于该阀值上传血压，如果未设置，则留空
+            //90: 血压低压阀值，低压高于该阀值上传血压，如果未设置，则留空
+            //110: 血压高压阀值，高压低于该阀值上传血压，如果未设置，则留空
+            //140: 血压高压阀值，高压高于该阀值上传血压，如果未设置，则留空
+            //95 血氧阈值，低于该阈值终端立即显示报警，并上传血氧消息，如果未设置，则留空（新增）
+            String[] list = cmd.split(CMDSPLIT);
+            if (list.length == 10) {
+                String index = list[2];
+                String PPGH = list[3];
+                String PPGL = list[4];
+                String BPH_H = list[5];
+                String BPH_L = list[6];
+                String BPL_H = list[7];
+                String BPL_L = list[8];
+                String OXYGEN = list[9];
+                connection.send(AP89(index));
+                ICLogger.i("收到服务器指令：心率/血压阀值 "
+                        + PPGH + ","
+                        + PPGL + ","
+                        + BPH_H + ","
+                        + BPH_L + ","
+                        + BPL_H + ","
+                        + BPL_L + ","
+                        + OXYGEN);
+                //保存记录到全局设置中
+                //每次测完血压/血氧/心率进行比对
+                //如果超出了阀值，那么就创建警告通知
+                updateIcSettingsValue("heart_rate_bottom_limit_value", PPGH);
+                updateIcSettingsValue("heart_rate_top_limit_value", PPGL);
+                updateIcSettingsValue("blood_pressure_low_bottom_limit_value", BPL_L);
+                updateIcSettingsValue("blood_pressure_low_top_limit_value", BPL_H);
+                updateIcSettingsValue("blood_pressure_high_bottom_limit_value", BPH_L);
+                updateIcSettingsValue("blood_pressure_high_top_limit_value", BPH_H);
+                updateIcSettingsValue("blood_oxygen_limit_value", OXYGEN);
+                Config.LIMIT_VALUE_PPGH = Float.parseFloat(PPGH);
+                Config.LIMIT_VALUE_PPGL = Float.parseFloat(PPGL);
+                Config.LIMIT_VALUE_BPH_H = Float.parseFloat(BPH_H);
+                Config.LIMIT_VALUE_BPH_L = Float.parseFloat(BPH_L);
+                Config.LIMIT_VALUE_BPL_H = Float.parseFloat(BPL_H);
+                Config.LIMIT_VALUE_BPL_L = Float.parseFloat(BPL_L);
+                Config.LIMIT_VALUE_OXYGEN = Float.parseFloat(OXYGEN);
+            } else {
+                ICLogger.i("BP89 format error!" + cmd);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
@@ -2529,13 +2532,19 @@ public class protocol_s123 {
                 if (Integer.parseInt(switch_on) == 1) {
                     ICLogger.i("Handle BPDG index " + index + ", 体温报警阈值开 min="
                             + min_temp + ",max=" + max_temp);
-                    runtime.tempInfo.setBodyTempThreshold(Double.valueOf(max_temp), Double.valueOf(min_temp));
+                    runtime.tempInfo.setBodyTempThreshold(Double.parseDouble(max_temp),
+                            Double.parseDouble(min_temp), Double.parseDouble(maxWorkTemp),
+                            Double.parseDouble(minWorkTemp));
                     Config.needTemperature_abnormal_alarm = true;
                     //阀值入库
                     updateIcSettingsValue("body_temperature_bottom_value", min_temp);
                     updateIcSettingsValue("body_temperature_top_value", max_temp);
-                    Config.LIMIT_VALUE_TEMPERATURE_TOP = Integer.parseInt(max_temp);
-                    Config.LIMIT_VALUE_TEMPERATURE_BOTTOM = Integer.parseInt(min_temp);
+                    Config.LIMIT_VALUE_TEMPERATURE_TOP = Float.parseFloat(max_temp);
+                    Config.LIMIT_VALUE_TEMPERATURE_BOTTOM = Float.parseFloat(min_temp);
+                    Config.LIMIT_VALUE_WORK_TEMPERATURE_TOP = Float.parseFloat(maxWorkTemp);
+                    Config.LIMIT_VALUE_WORK_TEMPERATURE_BOTTOM = Float.parseFloat(minWorkTemp);
+                    updateIcSettingsValue("limit_value_work_temperature_top", maxWorkTemp);
+                    updateIcSettingsValue("limit_value_work_temperature_bottom", minWorkTemp);
                 } else {
                     ICLogger.i("Handle BPDG index " + index + ", 体温报警阈值关 ");
                     Config.needTemperature_abnormal_alarm = false;

diff --git a/app/src/main/res/values-de-rCH/strings.xml b/app/src/main/res/values-de-rCH/strings.xml
index 30658c2..e938d5c 100644 (file)
--- a/app/src/main/res/values-de-rCH/strings.xml
+++ b/app/src/main/res/values-de-rCH/strings.xml
@@ -170,4 +170,6 @@
     <string name="alarm_drink_time_tips_text">喝水提醒</string>\r
     <string name="alarm_sit_too_long_tips_text">久坐提醒</string>\r
     <string name="alarm_text">闹钟</string>\r
+    <string name="out_temp_too_high_text">环境温度过高</string>\r
+    <string name="out_temp_too_low_text">环境温度过低</string>\r
 </resources>\r

diff --git a/app/src/main/res/values-fr-rCH/strings.xml b/app/src/main/res/values-fr-rCH/strings.xml
index a075e28..2593971 100644 (file)
--- a/app/src/main/res/values-fr-rCH/strings.xml
+++ b/app/src/main/res/values-fr-rCH/strings.xml
@@ -170,4 +170,6 @@
     <string name="alarm_drink_time_tips_text">喝水提醒</string>\r
     <string name="alarm_sit_too_long_tips_text">久坐提醒</string>\r
     <string name="alarm_text">闹钟</string>\r
+    <string name="out_temp_too_high_text">环境温度过高</string>\r
+    <string name="out_temp_too_low_text">环境温度过低</string>\r
 </resources>\r

diff --git a/app/src/main/res/values-it-rCH/strings.xml b/app/src/main/res/values-it-rCH/strings.xml
index 044fe06..da03ad4 100644 (file)
--- a/app/src/main/res/values-it-rCH/strings.xml
+++ b/app/src/main/res/values-it-rCH/strings.xml
@@ -168,4 +168,6 @@
     <string name="alarm_drink_time_tips_text">喝水提醒</string>\r
     <string name="alarm_sit_too_long_tips_text">久坐提醒</string>\r
     <string name="alarm_text">闹钟</string>\r
+    <string name="out_temp_too_high_text">环境温度过高</string>\r
+    <string name="out_temp_too_low_text">环境温度过低</string>\r
 </resources>\r

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b283dd5..e00afc7 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -167,9 +167,11 @@
     <string name="back_text">戻る</string>
     <string name="send_text">送信</string>
     <string name="receiver_we_talk_msg">チャットメッセージが届く.</string>
-    <string name="alarm_pill_time_tips">吃药提醒</string>
-    <string name="alarm_drink_time_tips_text">喝水提醒</string>
-    <string name="alarm_sit_too_long_tips_text">久坐提醒</string>
-    <string name="alarm_text">闹钟</string>
+    <string name="alarm_pill_time_tips">薬の注意</string>
+    <string name="alarm_drink_time_tips_text">水の注意</string>
+    <string name="alarm_sit_too_long_tips_text">長時間座って注意する</string>
+    <string name="alarm_text">目覚まし时计</string>
+    <string name="out_temp_too_high_text">環境温度が高すぎる</string>
+    <string name="out_temp_too_low_text">環境温度が低すぎる</string>
 
 </resources>

diff --git a/app/src/main/res/values-w820dp/strings.xml b/app/src/main/res/values-w820dp/strings.xml
index 631d743..c7b437f 100644 (file)
--- a/app/src/main/res/values-w820dp/strings.xml
+++ b/app/src/main/res/values-w820dp/strings.xml
@@ -4,4 +4,6 @@
     <string name="alarm_drink_time_tips_text">喝水提醒</string>
     <string name="alarm_sit_too_long_tips_text">久坐提醒</string>
     <string name="alarm_text">闹钟</string>
+    <string name="out_temp_too_high_text">环境温度过高</string>
+    <string name="out_temp_too_low_text">环境温度过低</string>
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 114e880..1490bdd 100644 (file)
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -198,4 +198,6 @@
     <string name="alarm_drink_time_tips_text">喝水提醒</string>
     <string name="alarm_sit_too_long_tips_text">久坐提醒</string>
     <string name="alarm_text">闹钟</string>
+    <string name="out_temp_too_high_text">环境温度过高</string>
+    <string name="out_temp_too_low_text">环境温度过低</string>
 </resources>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0749299..44c9970 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -201,5 +201,7 @@
     <string name="alarm_drink_time_tips_text">喝水提醒</string>
     <string name="alarm_sit_too_long_tips_text">久坐提醒</string>
     <string name="alarm_text">闹钟</string>
+    <string name="out_temp_too_high_text">环境温度过高</string>
+    <string name="out_temp_too_low_text">环境温度过低</string>
 
 </resources>

diff --git a/app/version_code.properties b/app/version_code.properties
index e4f26e5..5736cf1 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Aug 14 18:18:12 CST 2021\r
-VERSION_CODE=913\r
+#Sat Aug 14 19:35:17 CST 2021\r
+VERSION_CODE=914\r