From: snickersun <scy@incartech.cn>
Date: Tue, 3 Nov 2020 12:09:35 +0000 (+0800)
Subject: release V687
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=6ff3641c9652cb4dcca07954b931a47cee3f6745;p=protocol_srv.git

release V687
久坐判断条件放宽，等于也判断为久坐。
---

diff --git a/app/release/ICSer_V686_2011031947_release.apk b/app/release/ICSer_V687_2011032007_release.apk
similarity index 79%
rename from app/release/ICSer_V686_2011031947_release.apk
rename to app/release/ICSer_V687_2011032007_release.apk
index c0c5ef1a..689cbb78 100644
Binary files a/app/release/ICSer_V686_2011031947_release.apk and b/app/release/ICSer_V687_2011032007_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index bd3c4a47..9d3efb65 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":686,"versionName":"2011031947","enabled":true,"outputFile":"ICSer_V686_2011031947_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V686_2011031947_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":687,"versionName":"2011032007","enabled":true,"outputFile":"ICSer_V687_2011032007_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V687_2011032007_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 9883c2cd..54033fd2 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -990,7 +990,7 @@ public class CoreService extends Service {
              int minutes=(int)TimeUtil.diffBetween2DateInMinutes(Runtime.lastSitCheckTiimeyyyyMMddHHmmss,dateyyyyMMDDhhmmss);
              ICLogger.i("SitCheck last SitCheckTime "+ Runtime.lastSitCheckTiimeyyyyMMddHHmmss + " , current checktime "+dateyyyyMMDDhhmmss);
              ICLogger.i("SitCheck minutes "+ minutes + " , keepsitRange "+keepsitRange);
-             if (minutes >keepsitRange && keepsitRange>0){
+             if (minutes >=keepsitRange && keepsitRange>0){
                 if ( (runtime.getTotalStepCount() - Runtime.lastSitCheckStepCount)/minutes < Config.KeepSitJudgementRefValue){
                     //平均 每分钟活动数 小于参考久坐计步值，表示久坐
                     ICLogger.i("SitCheck 平均 每分钟活动数 小于参考久坐计步值，表示久坐");
diff --git a/app/version_code.properties b/app/version_code.properties
index 5b97e18f..0be0e949 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Nov 03 19:47:51 CST 2020
-VERSION_CODE=686
+#Tue Nov 03 20:07:50 CST 2020
+VERSION_CODE=687