From: SnickerSun <scy@incartech.cn>
Date: Wed, 30 Jun 2021 06:31:18 +0000 (+0800)
Subject: release PorotocolV2  V880
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=4f028036caaf858f151a88a25fe59fb09f1721ae;p=protocol_srv.git

release PorotocolV2  V880
解决L004 心率默认监测频率设置错误问题。
---

diff --git a/app/release/ICSer_V859_2106261553_release.apk b/app/release/ICSer_V880_2106301429_release.apk
similarity index 77%
rename from app/release/ICSer_V859_2106261553_release.apk
rename to app/release/ICSer_V880_2106301429_release.apk
index b43cb69a..ed30a8a3 100644
Binary files a/app/release/ICSer_V859_2106261553_release.apk and b/app/release/ICSer_V880_2106301429_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 23a4ee8d..f27aa143 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":879,"versionName":"2106282242","enabled":true,"outputFile":"ICSer_V879_2106282242_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V879_2106282242_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":880,"versionName":"2106301429","enabled":true,"outputFile":"ICSer_V880_2106301429_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V880_2106301429_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 2862b507..02b6a011 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -894,7 +894,7 @@ public class Config {
             ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH, true);
             DefaultLocationMode = CUSTOM_MOD8_GPS;
             DefaultLocationCycle = 10 * 60;
-            DefaultPPGTestCycleInMinutes = 6;
+            DefaultPPGTestCycleInMinutes = 60;
             DefaultTemperatureTestCycle = 60 * 60;
             noPushTxtNotifyDialog = true;
             noSMSNotifyDialog = true;
diff --git a/app/version_code.properties b/app/version_code.properties
index 279c2e89..0b2e3036 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,5 +1,5 @@
-#Mon Jun 28 22:42:14 CST 2021
->>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db
-VERSION_CODE=879
-=\=\=\=\=\=\=
-<<<<<<<=HEAD
+#Wed Jun 30 14:29:27 CST 2021
+>>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db
+VERSION_CODE=880
+<<<<<<<=HEAD
+=\=\=\=\=\=\=