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 c547783..d748e31 100644 (file)
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 36e24ea..65b4600 100644 (file)
--- 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 1a327e4..cb69467 100644 (file)
--- 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();\r
 \r
         if (Config.custom_name.equals("H88")) {\r
-\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF,true);\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED,true);\r
             if (Config.getConfigInitFlag(this) == 0) {\r
                 Config.setLocationMode(this, CUSTOM_MOD8_GPS);\r
                 Config.setLocationCycle(this, 3600);\r
                 Config.setPPGTestCycle(this, 60);\r
                 Config.setTemperatureTestCycle(runtime, 60 * 60);\r
                 Config.setConfigInitFlag(this, 1);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF,true);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED,true);\r
             }\r
         }else if (Config.custom_name.equals("l004")) {\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF,true);\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF,true);\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH,true);\r
+\r
             if (Config.getConfigInitFlag(this) == 0) {\r
                 Config.setLocationMode(this, CUSTOM_MOD8_GPS);\r
                 Config.setLocationCycle(this, 600);\r
                 Config.setPPGTestCycle(this, 0);\r
                 Config.setTemperatureTestCycle(runtime, 0);\r
                 Config.setConfigInitFlag(this, 1);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF,true);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF,true);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH,true);\r
+\r
             }\r
         }else if (Config.custom_name.equals("AK")) {\r
+\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_SOS,true);\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY,true);\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED,true);\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF,true);\r
+            Config.enableSleep=true;\r
+\r
             if (Config.getConfigInitFlag(this)==0) {\r
                 Config.setPPGTestCycle(this, 0);\r
                 Config.setTemperatureTestCycle(runtime, 0);\r
                 Config.setConfigInitFlag(this, 1);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_SOS,true);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY,true);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED,true);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF,true);\r
-                Config.enableSleep=true;\r
+\r
 //                int contactcount=runtime.getDbHelper().getContactCount(getContentResolver());\r
 //                ICLogger.i("=====Contact count "+contactcount);\r
 //                if(contactcount==0){ //如果没有SOS\r
@@ -664,16 +668,16 @@ public class CoreService extends Service {
 //                }\r
             }\r
         }else if (Config.custom_name.equals("SGL")) { //C5项目\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ESCAPE,true);\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF,true);\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF,true);\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH,true);\r
             if (Config.getConfigInitFlag(this)==0) {\r
                 Config.setLocationMode(this, CUSTOM_MOD8_GPS);\r
 //                Config.setLocationMode(this, CUSTOM_MOD8_WIFI);\r
                 Config.setLocationCycle(this, 5*60);\r
                 Config.setPPGTestCycle(this, 0);\r
                 Config.setTemperatureTestCycle(runtime, 0);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_ESCAPE,true);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF,true);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF,true);\r
-                Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH,true);\r
                 Config.setConfigInitFlag(this, 1);\r
 \r
 //                int contactcount=runtime.getDbHelper().getContactCount(getContentResolver());\r
@@ -702,7 +706,7 @@ public class CoreService extends Service {
         }\r
 \r
         Config.dumpAlarmConfig();\r
-        //初始化剪断，脱腕报警开关\r
+        //初始化剪断，脱腕报警开关（这个开关是界面提示显示用的，上面的Config.ConfigAlarm 是上报服务器消息的开关）\r
         runtime.setNeddReportCutoff(Config.getNeedCutOff(this));\r
         runtime.setNeedAntioff(Config.getNeedAntiOff(this));\r
 \r

diff --git a/app/version_code.properties b/app/version_code.properties
index bac1906..1bbdbf3 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Oct 12 14:15:33 CST 2020\r
-VERSION_CODE=642\r
+#Mon Oct 12 17:45:39 CST 2020\r
+VERSION_CODE=643\r