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 f56f171..2146ab4 100644 (file)
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 4ddf262..27acb9c 100644 (file)
--- 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 {
 \r
   }\r
 \r
+    public static String getSleepDate(Context context){\r
+        return Util.getSystemProperties("persist.sys."+Constants.SHAREKEY_SETTING_SLEEP_SCORE_DATE,"");\r
+    }\r
+\r
+\r
+    public static int getSleepScore(Context context){\r
+\r
+        return Util.getSystemPropertiesInt("persist.sys."+Constants.SHAREKEY_SETTING_SLEEP_SCORE,0);\r
+\r
+    }\r
   /**\r
    * 参考数据，平均每分钟步数来判断，大于 KeepSitJudgementRefValue 认为没有坐着。小于等于这个值认为坐着。\r
    */\r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 983af95..3cb7f71 100644 (file)
--- 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 {
 \r
         //初始化消息相关配置\r
         Config.LoadMessageConfigs();\r
-        if (Config.custom_branch_name.equals("H88")){\r
+        if (Config.custom_branch_name.equals("H88")) {\r
 \r
-            if (Config.getConfigInitFlag(this)==0) {\r
-                Config.setLocationMode(this, CUSTOM_MOD);\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.setTemperatureTestCycle(runtime, 60 * 60);\r
+                Config.setConfigInitFlag(this, 1);\r
             }\r
+        }else if (Config.custom_branch_name.equals("l004")) {\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
+            }\r
+\r
         }else{\r
 \r
             if (Config.getConfigInitFlag(this)==0) {\r
@@ -703,6 +712,9 @@ public class CoreService extends Service {
                     ICLogger.i("SitCheck 平均 每分钟活动数 小于参考久坐计步值，表示久坐");\r
                     runtime.getContextProxy().sendBroadcastSitLongAlarm(); //广播久坐消息\r
                     VibrateUtil.getInstance(this).VibrateOn(true);\r
+                    //提醒后 重置 lastCheckSitTime 以及 lastSitCheckStepCount ， 重新计时\r
+                    Runtime.lastSitCheckStepCount=runtime.getTotalStepCount();\r
+                    Runtime.lastSitCheckTiimeyyyyMMddHHmmss=TimeUtil.getSystemTime3();\r
                 }else{\r
                     //只要 平均每分钟活动数大于参考值，则重置 lastCheckSitTime 以及 lastSitCheckStepCount\r
                     ICLogger.i("SitCheck 平均每分钟活动数大于参考值，则重置 lastCheckSitTime 以及 lastSitCheckStepCount");\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 3d5daf1..4cf0326 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Aug 08 12:21:06 CST 2020\r
-VERSION_CODE=484\r
+#Sat Aug 08 15:41:23 CST 2020\r
+VERSION_CODE=485\r