release V440

1、强制 默认心跳时间为5分钟
2、H88 心率，体温默认60分钟。
   L05 ，l03 根据硬件配置 设置体温心率检测与否。

diff --git a/app/release/ICSer_V439_2007121833_release.apk b/app/release/ICSer_V440_2007122146_release.apk
similarity index 79%
rename from app/release/ICSer_V439_2007121833_release.apk
rename to app/release/ICSer_V440_2007122146_release.apk
index dc10278..3453486 100644 (file)
Binary files a/app/release/ICSer_V439_2007121833_release.apk and b/app/release/ICSer_V440_2007122146_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 c6a3b9c..80cc05c 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -18,6 +18,7 @@ import org.json.JSONStringer;
 import java.io.File;\r
 import java.util.concurrent.TimeUnit;\r
 \r
+import static com.enqualcomm.support.utils.Util.connectWifiByReflectMethod;\r
 import static com.enqualcomm.support.utils.Util.getSystemProperties;\r
 \r
 public class Config {\r
@@ -48,12 +49,16 @@ public class Config {
   public static final int WiFiLocationTimeoutInSeconds=12;\r
 \r
   public static String c43_branch_name="none";\r
+  public static String c41_branch_name="none";\r
 \r
   public static boolean noSMSNotifyDialog=false;\r
   public static boolean noPushTxtNotifyDialog=false;\r
   public static boolean noVoiceNotifyDialog=false;\r
   public static boolean SOSNoNeedDial=false;\r
 \r
+  public static boolean noTempSensor=false;\r
+  public static boolean noPPGSensor=false;\r
+\r
   static  {\r
   \r
   }\r
@@ -369,20 +374,30 @@ public class Config {
         noPushTxtNotifyDialog=true;\r
         noSMSNotifyDialog=true;\r
         noVoiceNotifyDialog=true;\r
-        if (c43_branch_name.equals("l05")) SOSNoNeedDial=true;\r
+        noTempSensor=true;\r
+        if (c43_branch_name.equals("l05")) {\r
+          SOSNoNeedDial=true;\r
+        }else{\r
+          noPPGSensor=true;\r
+        }\r
     }\r
-    String c41_branch_name=Util.getSystemProperties("persist.sys.c41.branch");\r
+    c41_branch_name=Util.getSystemProperties("persist.sys.c41.branch");\r
 \r
     if ((c41_branch_name.equals("H88")) ){\r
       noPushTxtNotifyDialog=true;\r
       noSMSNotifyDialog=false;\r
       noVoiceNotifyDialog=false;\r
+      noPPGSensor=false;\r
+      noTempSensor=false;\r
+    }else if  ((c41_branch_name.equals("AK")) ){\r
+      noPPGSensor=false;\r
+      noTempSensor=false;\r
     }\r
 \r
   }\r
 \r
   public static void loadTemperatureSettings(Runtime runtime){\r
-    runtime.temp_test_Cycle = SharPreferenceUtil.getPrefInt(runtime.getContextProxy().context, KeyTempTestCycle, 30);\r
+    runtime.temp_test_Cycle = SharPreferenceUtil.getPrefInt(runtime.getContextProxy().context, KeyTempTestCycle, 60);\r
   }\r
 \r
   public static void setTemperatureTestCycle(Runtime runtime,int cycle_minutes) {\r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index e311340..f634cc0 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -524,8 +524,11 @@ public class CoreService extends Service {
         }\r
 \r
 \r
-\r
-   //     Config.setHeartBeatCycle(this,3); //临时设置为3分钟，给L03测试用。测试断线问题未解决，取消测试。\r
+        if (Config.c41_branch_name.equals("H88")){\r
+            Config.setPPGTestCycle(this,60);\r
+            Config.setTemperatureTestCycle(runtime,60);\r
+        }\r
+        Config.setHeartBeatCycle(this,5); //临时设置为3分钟，给L03测试用。测试断线问题未解决，取消测试。\r
         //初始化ServerHeartBeat Cycle\r
         Config.loadHearBeatSetting(runtime);\r
         //初始化PPG，LocationMod，LocationCycle\r
@@ -645,6 +648,7 @@ public class CoreService extends Service {
         setLocationAlarm(runtime.getLocationInstance().getWorkingMod());\r
 \r
         //设置温度测量间隔时间\r
+\r
         setTempAlarm();\r
 \r
         //设置来电模式\r
@@ -842,7 +846,9 @@ public class CoreService extends Service {
     }\r
 \r
     public void setHeartRateDetectAlarm(int heartRateDetectAlarmCycle){\r
-        if (heartRateDetectAlarmCycle>2)\r
+        if (Config.noPPGSensor)\r
+            return ;\r
+        if (heartRateDetectAlarmCycle>1)\r
         AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,heartRateDetectAlarmCycle,ACTION_HEATR_RATE_START);\r
     }\r
     public void setAntiCheckAlarm(){\r
@@ -895,7 +901,7 @@ public class CoreService extends Service {
         StringBuilder sb=new StringBuilder();\r
         int cycle=runtime.getHeartBeatCycle();\r
 \r
-        //心跳指令默认设置为3分钟\r
+        //心跳指令默认设置\r
         AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,cycle, HEART_ALARM);\r
         sb.append(" setHeartAlarm  "+HEART_ALARM+", cycle "+cycle);\r
 //        locationClient.triggerLocationProcess();\r
@@ -923,8 +929,14 @@ public class CoreService extends Service {
         StringBuilder sb=new StringBuilder();\r
         int cycle=runtime.temp_test_Cycle;\r
 \r
-        AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,cycle, TEMP_ALARM);\r
-        sb.append(" setTempAlarm  "+TEMP_ALARM+", cycle "+cycle);\r
+        if(Config.noTempSensor)\r
+                    return;\r
+        if (cycle>1) {\r
+            AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context, cycle, TEMP_ALARM);\r
+            sb.append(" setTempAlarm  " + TEMP_ALARM + ", cycle " + cycle);\r
+        }else {\r
+            sb.append(" setTempAlarm  " + TEMP_ALARM + ", cycle " + cycle+"<=1 skip!");\r
+        }\r
 //        locationClient.triggerLocationProcess();\r
         ICLogger.i(sb.toString());\r
         FileOutputUtil.fileOutput(runtime.getCacheDir(),"alarmCycle",sb.toString());\r

diff --git a/app/version_code.properties b/app/version_code.properties
index f884992..d37214c 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sun Jul 12 18:33:28 CST 2020\r
-VERSION_CODE=439\r
+#Sun Jul 12 21:46:55 CST 2020\r
+VERSION_CODE=440\r