release V442

        H88默认模式仅设置一次，以便客户可以更改设置。

diff --git a/app/release/ICSer_V441_2007122246_release.apk b/app/release/ICSer_V442_2007122252_release.apk
similarity index 79%
rename from app/release/ICSer_V441_2007122246_release.apk
rename to app/release/ICSer_V442_2007122252_release.apk
index 8480879..c640431 100644 (file)
Binary files a/app/release/ICSer_V441_2007122246_release.apk and b/app/release/ICSer_V442_2007122252_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 04e4e51..5d7e35c 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -279,6 +279,13 @@ public class Config {
       return port;\r
   }\r
 \r
+  public static void setH88InitFlag(Context context,int flag){\r
+    SharPreferenceUtil.setPrefInt(context,"H88InitFlag",flag);\r
+  }\r
+\r
+  public static int getH88InitFlag(Context context){\r
+    return SharPreferenceUtil.getPrefInt(context,"H88InitFlag",0);\r
+  }\r
   public static void setFotaServerIP(Context context,String serverIP,int serverPort){\r
 \r
     SharPreferenceUtil.setPrefString(context,KeyFotaServerIP,serverIP);\r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index ae5f525..c363fb9 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -526,10 +526,14 @@ public class CoreService extends Service {
 \r
 \r
         if (Config.c41_branch_name.equals("H88")){\r
-            Config.setLocationMode(this, CUSTOM_MOD);\r
-            Config.setLocationCycle(this,3600);\r
-            Config.setPPGTestCycle(this,60);\r
-            Config.setTemperatureTestCycle(runtime,60);\r
+\r
+            if (Config.getH88InitFlag(this)==0) {\r
+                Config.setLocationMode(this, CUSTOM_MOD);\r
+                Config.setLocationCycle(this, 3600);\r
+                Config.setPPGTestCycle(this, 60);\r
+                Config.setTemperatureTestCycle(runtime, 60);\r
+                Config.setH88InitFlag(this,1);\r
+            }\r
         }\r
         Config.setHeartBeatCycle(this,5); //临时设置为3分钟，给L03测试用。测试断线问题未解决，取消测试。\r
         //初始化ServerHeartBeat Cycle\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 13dd8e7..0c27c55 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sun Jul 12 22:46:49 CST 2020\r
-VERSION_CODE=441\r
+#Sun Jul 12 22:52:23 CST 2020\r
+VERSION_CODE=442\r