From: snickersun <scy@incartech.cn>
Date: Sat, 8 Aug 2020 07:47:26 +0000 (+0800)
Subject: release V485
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=ad3e6692de414bb16d72a92716954230d27b4c1a;p=protocol_srv.git

release V485
L004 默认CUSTOM_MOD8_GPS 模式， 600秒定位周期，PPG ,Temp都关闭
根据客户要求，久坐提醒 结束马上重新计时。
---

diff --git a/app/release/ICSer_V484_2008081221_release.apk b/app/release/ICSer_V485_2008081541_release.apk
similarity index 79%
rename from app/release/ICSer_V484_2008081221_release.apk
rename to app/release/ICSer_V485_2008081541_release.apk
index f56f171e..2146ab4b 100644
Binary files a/app/release/ICSer_V484_2008081221_release.apk and b/app/release/ICSer_V485_2008081541_release.apk differ
diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 4ddf2622..27acb9c4 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -575,6 +575,16 @@ public class Config {
 
   }
 
+    public static String getSleepDate(Context context){
+        return Util.getSystemProperties("persist.sys."+Constants.SHAREKEY_SETTING_SLEEP_SCORE_DATE,"");
+    }
+
+
+    public static int getSleepScore(Context context){
+
+        return Util.getSystemPropertiesInt("persist.sys."+Constants.SHAREKEY_SETTING_SLEEP_SCORE,0);
+
+    }
   /**
    * 参考数据，平均每分钟步数来判断，大于 KeepSitJudgementRefValue 认为没有坐着。小于等于这个值认为坐着。
    */
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 983af950..3cb7f715 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -532,15 +532,24 @@ public class CoreService extends Service {
 
         //初始化消息相关配置
         Config.LoadMessageConfigs();
-        if (Config.custom_branch_name.equals("H88")){
+        if (Config.custom_branch_name.equals("H88")) {
 
-            if (Config.getConfigInitFlag(this)==0) {
-                Config.setLocationMode(this, CUSTOM_MOD);
+            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.setTemperatureTestCycle(runtime, 60 * 60);
+                Config.setConfigInitFlag(this, 1);
             }
+        }else if (Config.custom_branch_name.equals("l004")) {
+            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);
+            }
+
         }else{
 
             if (Config.getConfigInitFlag(this)==0) {
@@ -703,6 +712,9 @@ public class CoreService extends Service {
                     ICLogger.i("SitCheck 平均 每分钟活动数 小于参考久坐计步值，表示久坐");
                     runtime.getContextProxy().sendBroadcastSitLongAlarm(); //广播久坐消息
                     VibrateUtil.getInstance(this).VibrateOn(true);
+                    //提醒后 重置 lastCheckSitTime 以及 lastSitCheckStepCount ， 重新计时
+                    Runtime.lastSitCheckStepCount=runtime.getTotalStepCount();
+                    Runtime.lastSitCheckTiimeyyyyMMddHHmmss=TimeUtil.getSystemTime3();
                 }else{
                     //只要 平均每分钟活动数大于参考值，则重置 lastCheckSitTime 以及 lastSitCheckStepCount
                     ICLogger.i("SitCheck 平均每分钟活动数大于参考值，则重置 lastCheckSitTime 以及 lastSitCheckStepCount");
diff --git a/app/version_code.properties b/app/version_code.properties
index 3d5daf1c..4cf03261 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Aug 08 12:21:06 CST 2020
-VERSION_CODE=484
+#Sat Aug 08 15:41:23 CST 2020
+VERSION_CODE=485