update l004 unwear tips issues.

diff --git a/app/release/ICSer_V783_2105121430_release.apk b/app/release/ICSer_V785_2105241742_release.apk
similarity index 77%
rename from app/release/ICSer_V783_2105121430_release.apk
rename to app/release/ICSer_V785_2105241742_release.apk
index f445304..a49904d 100644 (file)
Binary files a/app/release/ICSer_V783_2105121430_release.apk and b/app/release/ICSer_V785_2105241742_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index ea1988e..a095e90 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":783,"versionName":"2105121430","enabled":true,"outputFile":"ICSer_V783_2105121430_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V783_2105121430_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":785,"versionName":"2105241742","enabled":true,"outputFile":"ICSer_V785_2105241742_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V785_2105241742_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 e335b6a..c52ca94 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -162,226 +162,6 @@ public class Config {
 
     public static int DefaultWifiStatus = 0; //0 close , 1 open, 2 open and connect using default wifi
 
-    static {
-        AlarmConfiglist = new HashMap<Integer, Boolean>();
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_SOS.ordinal(), true);
-        AlarmConfiglist.put(ALARM_LOWBATTERY.ordinal(), true);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_ANTIOFF.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_WEARED.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_CUTOFF.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_FALL.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_ABNORMAL_HEART_RATE.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_HEART_RATE_HIGH.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_HEART_RATE_LOW.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_BPH_HIGH.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_BPH_LOW.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_BPL_HIGH.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_BPL_LOW.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_SEDENTARY.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_LOCK_WATCH.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_TEMP_HIGH.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_TEMP_LOW.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_POWER_OFF.ordinal(), true);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_ESCAPE.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_NONE.ordinal(), false);
-        AlarmConfiglist.put(Runtime.AlarmType.ALARM_REMOVE_SOS.ordinal(), true);
-
-        disableWiFiScan = Util.getSystemProperties("persist.sys.disableWiFiLocation", "false").equals("true");
-        disableWristTemp = Util.getSystemProperties("persist.sys.disableWristTemp", "false").equals("true");
-        BLEScanProtocol = Util.getSystemPropertiesInt("persist.sys.BLEScanProtocol", 0);
-        JsonConfigFilePath = Util.getSystemProperties("persist.sys.JsonConfigFilePath", "/system/etc/protocol_config.json");
-        sendSOSAtOnce = Util.getSystemProperties("persist.sys.sos_at_once", "false").equals("true");
-
-
-        do_broadCast_message = Util.getSystemProperties("persist.sys.doBroadcastMSG", "false").equals("true");
-
-        noPPGSensor = (ICJniUtils.isPPGavailable() == 0);
-        noTempSensor = (ICJniUtils.isTemperatureDevAvailable() == 0);
-
-        //默认关闭NTP
-        disable_ntp_server = Util.getSystemProperties("persist.sys.disableNTP", "false").equals("true");
-
-        c43_branch_name = Util.getSystemProperties("persist.sys.c43.branch");
-
-        try {
-            DefaultWifiStatus = Integer.valueOf(Util.getSystemProperties("persist.sys.DefaultWifiStatus", "0"));
-        } catch (Exception e) {
-            ICLogger.e(e.getMessage(), e);
-        }
-
-        if ((c43_branch_name.equals("l03")) || (c43_branch_name.equals("l05"))) {
-            noPushTxtNotifyDialog = true;
-            noSMSNotifyDialog = true;
-            noVoiceNotifyDialog = true;
-            noTempSensor = true;
-            if (c43_branch_name.equals("l05")) {
-                SOSNoNeedDial = true;//采用新写的SOS，协议只需要发送消息，无需控制拨号。
-                noPPGSensor = false;
-            } else {
-                noPPGSensor = true;
-            }
-        }
-        custom_name = Util.getSystemProperties("persist.sys.customname");
-        ICLogger.i("get CUSTOMNAME " + custom_name);
-
-        if (custom_name.equals("H88") || custom_name.equals("H88A")) {
-            ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
-            DefaultLocationMode = CUSTOM_MOD8_GPS;
-            DefaultLocationCycle = 60 * 60;
-            DefaultPPGTestCycle = 60;
-            DefaultTemperatureTestCycle = 60 * 60;
-
-            noPushTxtNotifyDialog = true;
-            noSMSNotifyDialog = false;
-            noVoiceNotifyDialog = false;
-            noPPGSensor = false;
-            noTempSensor = false;
-            needBroadcastAntiAlarm = false;
-
-        } else if (Config.custom_name.equals("l004")) {
-            ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH, true);
-            DefaultLocationMode = CUSTOM_MOD8_GPS;
-            DefaultLocationCycle = 10 * 60;
-            DefaultPPGTestCycle = 0;
-            DefaultTemperatureTestCycle = 0;
-
-            noPushTxtNotifyDialog = true;
-            noSMSNotifyDialog = true;
-            noVoiceNotifyDialog = true;
-            needBroadcastAntiAlarm = false;
-            needBroadcastCutoffAlarm = true;
-            needAllwaysAlarmCutOff = false;
-            needAllwaysAlarmFenceOut = false;
-            needTemperature_abnormal_alarm = false;
-            noPPGSensor = false;
-            noTempSensor = false;
-            L004_BroadCastActionStrip = true;
-
-        } else if (custom_name.equals("YQ") || custom_name.equals("YQ_EN")) {
-            ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_UNREADMSG, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_MSGREAD, true);
-            DefaultLocationMode = NORMAL_MOD;
-            DefaultLocationCycle = 15 * 60;
-            DefaultPPGTestCycle = 0;
-            DefaultTemperatureTestCycle = 0;
-
-            noPushTxtNotifyDialog = false;
-            noSMSNotifyDialog = true;
-            noVoiceNotifyDialog = true;
-            noBroadCastPushTxtNotify = true;
-            noBroadCastSMSNotify = true;
-            needBroadcastAntiAlarm = false;
-            needBroadcastCutoffAlarm = true;
-            needAllwaysAlarmCutOff = true;
-            needAllwaysAlarmFenceOut = true;
-            needTemperature_abnormal_alarm = true;
-            noPushTxtReadReply = false;//A9需要阅读反馈
-            noPPGSensor = false;
-            noTempSensor = false;
-            A9_noBroadCastActionStrip = true;
-        } else if (custom_name.equals("AK")) {
-
-            ConfigAlarm(Runtime.AlarmType.ALARM_SOS, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
-            enableSleep = true;
-            DefaultLocationMode = NORMAL_MOD;
-            DefaultLocationCycle = 900;
-            DefaultPPGTestCycle = 0;
-            DefaultTemperatureTestCycle = 0;
-
-            noPushTxtNotifyDialog = true;
-            noSMSNotifyDialog = true;
-            noVoiceNotifyDialog = true;
-            noPPGSensor = false;
-            noTempSensor = true;
-            SOSNoNeedDial = true; //采用新写的SOS，协议只需要发送消息，无需控制拨号。
-
-        } else if (custom_name.equals("YT")) {
-
-            ConfigAlarm(Runtime.AlarmType.ALARM_SOS, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
-            enableSleep = true;
-
-            DefaultLocationMode = NORMAL_MOD;
-            DefaultLocationCycle = 900;
-            DefaultPPGTestCycle = 0;
-            DefaultTemperatureTestCycle = 0;
-
-            noPushTxtNotifyDialog = false;
-            noSMSNotifyDialog = false;
-            noVoiceNotifyDialog = false;
-            noPPGSensor = false;
-            noTempSensor = true;
-
-        } else if (custom_name.equals("SGL")) { //C5项目
-            ConfigAlarm(Runtime.AlarmType.ALARM_ESCAPE, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
-            ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
-            forceMoveCheck = false; //对定位不进行运动检测。
-
-            DefaultLocationMode = CUSTOM_MOD8_GPS;
-            DefaultLocationCycle = 5 * 60;
-            DefaultPPGTestCycle = 0;
-            DefaultTemperatureTestCycle = 0;
-
-            noPushTxtNotifyDialog = false;
-            noSMSNotifyDialog = false;
-            noVoiceNotifyDialog = true;
-            needBroadcastAntiAlarm = false;
-            needBroadcastCutoffAlarm = true;
-            needAllwaysAlarmCutOff = true;
-            needAllwaysAlarmFenceOut = false;
-            needTemperature_abnormal_alarm = false;
-            noPPGSensor = false;
-            noTempSensor = false;
-            C5_noBroadCastActionStrip = true;
-
-        } else if (Config.custom_name.equals("L02") || Config.custom_name.equals("L03") || Config.custom_name.equals("L05")) { //L02
-            Config.forceMoveCheck = false; //即爱对gps不进行运动检测，此变量专门为了给其他协议进行强制运动检测用的。
-            DefaultLocationMode = NORMAL_MOD;
-            DefaultLocationCycle = 900;
-            DefaultPPGTestCycle = 0;
-            DefaultTemperatureTestCycle = 0;
-            noPushTxtReadReply = false;//即爱需要阅读反馈
-            noBroadCastPushTxtNotify = true;
-        } else if (Config.custom_name.equals("VitracK") || Config.custom_name.equals("wtsrui")) {
-
-            Config.ConfigAlarm(Runtime.AlarmType.ALARM_SOS, true);
-            Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY, true);
-            Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
-            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
-            enableSleep = false;
-            DefaultLocationMode = CUSTOM_MOD8_GPS;
-            DefaultLocationCycle = 15 * 60;
-            DefaultPPGTestCycle = 15;
-            DefaultTemperatureTestCycle = 15 * 60;
-
-        } else {
-
-            DefaultLocationMode = NORMAL_MOD;
-            DefaultLocationCycle = 900;
-            DefaultPPGTestCycle = 0;
-            DefaultTemperatureTestCycle = 0;
-            noBroadCastPushTxtNotify = true;
-        }
-    }
-
     static void load_config_fromfile() {
         try {
             JsonReader jsonReader = null;
@@ -673,10 +453,10 @@ public class Config {
     public static boolean needAllwaysAlarmCutOff = false;
 
     //体温非正常报警
-    public static boolean needTemperature_abnormal_alarm = false;
-    public static boolean A9_noBroadCastActionStrip = false;
-    public static boolean C5_noBroadCastActionStrip = false;
-    public static boolean L004_BroadCastActionStrip = false;
+    public static boolean needTemperature_abnormal_alarm;
+    public static boolean A9_noBroadCastActionStrip;
+    public static boolean C5_noBroadCastActionStrip;
+    public static boolean L004_BroadCastActionStrip;
 
     //停止系统NTP时钟同步标志
     public static boolean disable_ntp_server = false;
@@ -1018,5 +798,228 @@ public class Config {
         }
     }
 
+
+
+    static {
+        AlarmConfiglist = new HashMap<>();
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_SOS.ordinal(), true);
+        AlarmConfiglist.put(ALARM_LOWBATTERY.ordinal(), true);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_ANTIOFF.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_WEARED.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_CUTOFF.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_FALL.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_ABNORMAL_HEART_RATE.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_HEART_RATE_HIGH.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_HEART_RATE_LOW.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_BPH_HIGH.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_BPH_LOW.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_BPL_HIGH.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_BPL_LOW.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_SEDENTARY.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_LOCK_WATCH.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_TEMP_HIGH.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_TEMP_LOW.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_POWER_OFF.ordinal(), true);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_ESCAPE.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_NONE.ordinal(), false);
+        AlarmConfiglist.put(Runtime.AlarmType.ALARM_REMOVE_SOS.ordinal(), true);
+
+        disableWiFiScan = Util.getSystemProperties("persist.sys.disableWiFiLocation", "false").equals("true");
+        disableWristTemp = Util.getSystemProperties("persist.sys.disableWristTemp", "false").equals("true");
+        BLEScanProtocol = Util.getSystemPropertiesInt("persist.sys.BLEScanProtocol", 0);
+        JsonConfigFilePath = Util.getSystemProperties("persist.sys.JsonConfigFilePath", "/system/etc/protocol_config.json");
+        sendSOSAtOnce = Util.getSystemProperties("persist.sys.sos_at_once", "false").equals("true");
+
+
+        do_broadCast_message = Util.getSystemProperties("persist.sys.doBroadcastMSG", "false").equals("true");
+
+        noPPGSensor = (ICJniUtils.isPPGavailable() == 0);
+        noTempSensor = (ICJniUtils.isTemperatureDevAvailable() == 0);
+
+        //默认关闭NTP
+        disable_ntp_server = Util.getSystemProperties("persist.sys.disableNTP", "false").equals("true");
+
+        c43_branch_name = Util.getSystemProperties("persist.sys.c43.branch");
+
+        try {
+            DefaultWifiStatus = Integer.valueOf(Util.getSystemProperties("persist.sys.DefaultWifiStatus", "0"));
+        } catch (Exception e) {
+            ICLogger.e(e.getMessage(), e);
+        }
+
+        if ((c43_branch_name.equals("l03")) || (c43_branch_name.equals("l05"))) {
+            noPushTxtNotifyDialog = true;
+            noSMSNotifyDialog = true;
+            noVoiceNotifyDialog = true;
+            noTempSensor = true;
+            if (c43_branch_name.equals("l05")) {
+                SOSNoNeedDial = true;//采用新写的SOS，协议只需要发送消息，无需控制拨号。
+                noPPGSensor = false;
+            } else {
+                noPPGSensor = true;
+            }
+        }
+        custom_name = Util.getSystemProperties("persist.sys.customname");
+        ICLogger.i("get CUSTOMNAME " + custom_name);
+
+        if (custom_name.equals("H88") || custom_name.equals("H88A")) {
+            ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
+            DefaultLocationMode = CUSTOM_MOD8_GPS;
+            DefaultLocationCycle = 60 * 60;
+            DefaultPPGTestCycle = 60;
+            DefaultTemperatureTestCycle = 60 * 60;
+
+            noPushTxtNotifyDialog = true;
+            noSMSNotifyDialog = false;
+            noVoiceNotifyDialog = false;
+            noPPGSensor = false;
+            noTempSensor = false;
+            needBroadcastAntiAlarm = false;
+
+        } else if (Config.custom_name.equals("l004")) {
+            ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH, true);
+            DefaultLocationMode = CUSTOM_MOD8_GPS;
+            DefaultLocationCycle = 10 * 60;
+            DefaultPPGTestCycle = 0;
+            DefaultTemperatureTestCycle = 0;
+
+            noPushTxtNotifyDialog = true;
+            noSMSNotifyDialog = true;
+            noVoiceNotifyDialog = true;
+            needBroadcastAntiAlarm = false;
+            needBroadcastCutoffAlarm = true;
+            needAllwaysAlarmCutOff = false;
+            needAllwaysAlarmFenceOut = false;
+            needTemperature_abnormal_alarm = false;
+            noPPGSensor = false;
+            noTempSensor = false;
+            L004_BroadCastActionStrip = true;
+
+        } else if (custom_name.equals("YQ") || custom_name.equals("YQ_EN")) {
+            ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_UNREADMSG, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_MSGREAD, true);
+            DefaultLocationMode = NORMAL_MOD;
+            DefaultLocationCycle = 15 * 60;
+            DefaultPPGTestCycle = 0;
+            DefaultTemperatureTestCycle = 0;
+
+            noPushTxtNotifyDialog = false;
+            noSMSNotifyDialog = true;
+            noVoiceNotifyDialog = true;
+            noBroadCastPushTxtNotify = true;
+            noBroadCastSMSNotify = true;
+            needBroadcastAntiAlarm = false;
+            needBroadcastCutoffAlarm = true;
+            needAllwaysAlarmCutOff = true;
+            needAllwaysAlarmFenceOut = true;
+            needTemperature_abnormal_alarm = true;
+            noPushTxtReadReply = false;//A9需要阅读反馈
+            noPPGSensor = false;
+            noTempSensor = false;
+            A9_noBroadCastActionStrip = true;
+        } else if (custom_name.equals("AK")) {
+
+            ConfigAlarm(Runtime.AlarmType.ALARM_SOS, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
+            enableSleep = true;
+            DefaultLocationMode = NORMAL_MOD;
+            DefaultLocationCycle = 900;
+            DefaultPPGTestCycle = 0;
+            DefaultTemperatureTestCycle = 0;
+
+            noPushTxtNotifyDialog = true;
+            noSMSNotifyDialog = true;
+            noVoiceNotifyDialog = true;
+            noPPGSensor = false;
+            noTempSensor = true;
+            SOSNoNeedDial = true; //采用新写的SOS，协议只需要发送消息，无需控制拨号。
+
+        } else if (custom_name.equals("YT")) {
+
+            ConfigAlarm(Runtime.AlarmType.ALARM_SOS, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
+            enableSleep = true;
+
+            DefaultLocationMode = NORMAL_MOD;
+            DefaultLocationCycle = 900;
+            DefaultPPGTestCycle = 0;
+            DefaultTemperatureTestCycle = 0;
+
+            noPushTxtNotifyDialog = false;
+            noSMSNotifyDialog = false;
+            noVoiceNotifyDialog = false;
+            noPPGSensor = false;
+            noTempSensor = true;
+
+        } else if (custom_name.equals("SGL")) { //C5项目
+            ConfigAlarm(Runtime.AlarmType.ALARM_ESCAPE, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
+            ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
+            forceMoveCheck = false; //对定位不进行运动检测。
+
+            DefaultLocationMode = CUSTOM_MOD8_GPS;
+            DefaultLocationCycle = 5 * 60;
+            DefaultPPGTestCycle = 0;
+            DefaultTemperatureTestCycle = 0;
+
+            noPushTxtNotifyDialog = false;
+            noSMSNotifyDialog = false;
+            noVoiceNotifyDialog = true;
+            needBroadcastAntiAlarm = false;
+            needBroadcastCutoffAlarm = true;
+            needAllwaysAlarmCutOff = true;
+            needAllwaysAlarmFenceOut = false;
+            needTemperature_abnormal_alarm = false;
+            noPPGSensor = false;
+            noTempSensor = false;
+            C5_noBroadCastActionStrip = true;
+
+        } else if (Config.custom_name.equals("L02") || Config.custom_name.equals("L03") || Config.custom_name.equals("L05")) { //L02
+            Config.forceMoveCheck = false; //即爱对gps不进行运动检测，此变量专门为了给其他协议进行强制运动检测用的。
+            DefaultLocationMode = NORMAL_MOD;
+            DefaultLocationCycle = 900;
+            DefaultPPGTestCycle = 0;
+            DefaultTemperatureTestCycle = 0;
+            noPushTxtReadReply = false;//即爱需要阅读反馈
+            noBroadCastPushTxtNotify = true;
+        } else if (Config.custom_name.equals("VitracK") || Config.custom_name.equals("wtsrui")) {
+
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_SOS, true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY, true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
+            enableSleep = false;
+            DefaultLocationMode = CUSTOM_MOD8_GPS;
+            DefaultLocationCycle = 15 * 60;
+            DefaultPPGTestCycle = 15;
+            DefaultTemperatureTestCycle = 15 * 60;
+
+        } else {
+
+            DefaultLocationMode = NORMAL_MOD;
+            DefaultLocationCycle = 900;
+            DefaultPPGTestCycle = 0;
+            DefaultTemperatureTestCycle = 0;
+            noBroadCastPushTxtNotify = true;
+        }
+    }
+
+
 }
 

diff --git a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
index 80ea06c..49673d4 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -427,9 +427,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService implements
                 intent.putExtra(KEY_ANTI_TXT, "");
                 mContext.sendBroadcast(intent);
             } else if (Config.C5_noBroadCastActionStrip) {
-
                 Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_lock_success));
-
             } else {
                 intent.putExtra(KEY_ANTI_TXT, "");
                 mContext.sendBroadcast(intent);

diff --git a/app/src/main/java/com/ic/protocols/protocol_beehome.java b/app/src/main/java/com/ic/protocols/protocol_beehome.java
index 1cf3691..b886bae 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_beehome.java
+++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java
@@ -1689,11 +1689,12 @@ public class protocol_beehome {
         //APTP : 命令字符
         //35.3：测量体温 （摄氏度）
         //33，132：温补用的参数，此处不用，可以用0 来代替。
-        return genStringMessage(cmdMap.get(CMD_TYPE.APTP), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APTP))
-                .append(CMDSPLIT).append(String.format("%1$.2f", body_temp))
-                .append(CMDSPLIT).append(String.format("%1$.2f", wrist_temp))
-                .append(CMDSPLIT).append(0)
-                .append(CMDEND).toString());
+        return genStringMessage(cmdMap.get(CMD_TYPE.APTP),
+                new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APTP))
+                        .append(CMDSPLIT).append(String.format("%1$.2f", body_temp))
+                        .append(CMDSPLIT).append(String.format("%1$.2f", wrist_temp))
+                        .append(CMDSPLIT).append(0)
+                        .append(CMDEND).toString());
     }
 
     public void handleBPTP() {
@@ -1780,10 +1781,14 @@ public class protocol_beehome {
             //24小时格式制
             //12小时格式制
             is24Hour = "1".equals(split[2]);
+            ICLogger.d("is24Hour == > " + is24Hour);
             TimeUtil.set24Hour(mRuntime.getContextProxy().context, is24Hour);
             mConnection.send(
-                    genStringMessage(cmdMap.get(CMD_TYPE.APTF), new StringBuilder(CMDHEADER).append(cmdMap.get(CMD_TYPE.APTF)).append(CMDSPLIT)
-                            .append(split[2]).append(CMDEND).toString())
+                    genStringMessage(cmdMap.get(CMD_TYPE.APTF),
+                            new StringBuilder(CMDHEADER)
+                                    .append(cmdMap.get(CMD_TYPE.APTF))
+                                    .append(CMDSPLIT)
+                                    .append(split[2]).append(CMDEND).toString())
             );
         }
     }

diff --git a/app/version_code.properties b/app/version_code.properties
index 868b481..e23acac 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed May 12 14:30:06 CST 2021
-VERSION_CODE=783
+#Mon May 24 17:42:57 CST 2021
+VERSION_CODE=785