From: snickersun <scy@incartech.cn>
Date: Mon, 12 Oct 2020 09:48:28 +0000 (+0800)
Subject: release V643
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=936464f478c365ab70d69e93fbb78029622421f6;p=protocol_srv.git

release V643
解决Config.ConfigAlarm 只有第一次配置生效，重启就失效的问题。
---

diff --git a/app/release/ICSer_V642_2010121415_release.apk b/app/release/ICSer_V643_2010121745_release.apk
similarity index 87%
rename from app/release/ICSer_V642_2010121415_release.apk
rename to app/release/ICSer_V643_2010121745_release.apk
index c5477838..d748e317 100644
Binary files a/app/release/ICSer_V642_2010121415_release.apk and b/app/release/ICSer_V643_2010121745_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 36e24eaa..65b46002 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":642,"versionName":"2010121415","enabled":true,"outputFile":"ICSer_V642_2010121415_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V642_2010121415_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":643,"versionName":"2010121745","enabled":true,"outputFile":"ICSer_V643_2010121745_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V643_2010121745_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 1a327e4b..cb69467e 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -623,37 +623,41 @@ public class CoreService extends Service {
         Config.LoadMessageConfigs();
 
         if (Config.custom_name.equals("H88")) {
-
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF,true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED,true);
             if (Config.getConfigInitFlag(this) == 0) {
                 Config.setLocationMode(this, CUSTOM_MOD8_GPS);
                 Config.setLocationCycle(this, 3600);
                 Config.setPPGTestCycle(this, 60);
                 Config.setTemperatureTestCycle(runtime, 60 * 60);
                 Config.setConfigInitFlag(this, 1);
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF,true);
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED,true);
             }
         }else if (Config.custom_name.equals("l004")) {
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF,true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF,true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH,true);
+
             if (Config.getConfigInitFlag(this) == 0) {
                 Config.setLocationMode(this, CUSTOM_MOD8_GPS);
                 Config.setLocationCycle(this, 600);
                 Config.setPPGTestCycle(this, 0);
                 Config.setTemperatureTestCycle(runtime, 0);
                 Config.setConfigInitFlag(this, 1);
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF,true);
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF,true);
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH,true);
+
             }
         }else if (Config.custom_name.equals("AK")) {
+
+            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);
+            Config.enableSleep=true;
+
             if (Config.getConfigInitFlag(this)==0) {
                 Config.setPPGTestCycle(this, 0);
                 Config.setTemperatureTestCycle(runtime, 0);
                 Config.setConfigInitFlag(this, 1);
-                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);
-                Config.enableSleep=true;
+
 //                int contactcount=runtime.getDbHelper().getContactCount(getContentResolver());
 //                ICLogger.i("=====Contact count "+contactcount);
 //                if(contactcount==0){ //如果没有SOS
@@ -664,16 +668,16 @@ public class CoreService extends Service {
 //                }
             }
         }else if (Config.custom_name.equals("SGL")) { //C5项目
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ESCAPE,true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF,true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF,true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH,true);
             if (Config.getConfigInitFlag(this)==0) {
                 Config.setLocationMode(this, CUSTOM_MOD8_GPS);
 //                Config.setLocationMode(this, CUSTOM_MOD8_WIFI);
                 Config.setLocationCycle(this, 5*60);
                 Config.setPPGTestCycle(this, 0);
                 Config.setTemperatureTestCycle(runtime, 0);
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_ESCAPE,true);
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF,true);
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF,true);
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH,true);
                 Config.setConfigInitFlag(this, 1);
 
 //                int contactcount=runtime.getDbHelper().getContactCount(getContentResolver());
@@ -702,7 +706,7 @@ public class CoreService extends Service {
         }
 
         Config.dumpAlarmConfig();
-        //初始化剪断，脱腕报警开关
+        //初始化剪断，脱腕报警开关（这个开关是界面提示显示用的，上面的Config.ConfigAlarm 是上报服务器消息的开关）
         runtime.setNeddReportCutoff(Config.getNeedCutOff(this));
         runtime.setNeedAntioff(Config.getNeedAntiOff(this));
 
diff --git a/app/version_code.properties b/app/version_code.properties
index bac1906a..1bbdbf3d 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Oct 12 14:15:33 CST 2020
-VERSION_CODE=642
+#Mon Oct 12 17:45:39 CST 2020
+VERSION_CODE=643