From: snickersun <scy@incartech.cn>
Date: Tue, 13 Oct 2020 13:39:34 +0000 (+0800)
Subject: release V647
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=19c61a132b1ce9524f0eacbef36bc98330889181;p=protocol_srv.git

release V647
添加YQ，YQ_EN 的默认报警信息配置。
---

diff --git a/app/release/ICSer_V645_2010131213_release.apk b/app/release/ICSer_V647_2010132120_release.apk
similarity index 78%
rename from app/release/ICSer_V645_2010131213_release.apk
rename to app/release/ICSer_V647_2010132120_release.apk
index 1a70ab0f..6f043346 100644
Binary files a/app/release/ICSer_V645_2010131213_release.apk and b/app/release/ICSer_V647_2010132120_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 67ea5bc8..f1c222d1 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":645,"versionName":"2010131213","enabled":true,"outputFile":"ICSer_V645_2010131213_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V645_2010131213_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":647,"versionName":"2010132120","enabled":true,"outputFile":"ICSer_V647_2010132120_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V647_2010132120_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 79ac5d11..cd79028a 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -644,6 +644,20 @@ public class CoreService extends Service {
                 Config.setTemperatureTestCycle(runtime, 0);
                 Config.setConfigInitFlag(this, 1);
 
+            }
+        }else if (Config.custom_name.equals("YQ") || Config.custom_name.equals("YQ_EN")) {
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF,true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF,true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH,true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED,true);
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF,true);
+            if (Config.getConfigInitFlag(this) == 0) {
+                Config.setLocationMode(this, NORMAL_MOD);
+                Config.setLocationCycle(this, 15*60);
+                Config.setPPGTestCycle(this, 0);
+                Config.setTemperatureTestCycle(runtime, 0);
+                Config.setConfigInitFlag(this, 1);
+
             }
         }else if (Config.custom_name.equals("AK")) {
 
diff --git a/app/version_code.properties b/app/version_code.properties
index b647750f..a9c96afb 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Oct 13 12:13:36 CST 2020
-VERSION_CODE=645
+#Tue Oct 13 21:20:34 CST 2020
+VERSION_CODE=647