From: snickersun Date: Sun, 12 Jul 2020 14:53:48 +0000 (+0800) Subject: release V442 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=d84ac6935450c6158437b8760caf4f5df5ff34a3;p=protocol_srv.git 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 8480879a..c640431a 100644 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 04e4e518..5d7e35c7 100644 --- 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; } + public static void setH88InitFlag(Context context,int flag){ + SharPreferenceUtil.setPrefInt(context,"H88InitFlag",flag); + } + + public static int getH88InitFlag(Context context){ + return SharPreferenceUtil.getPrefInt(context,"H88InitFlag",0); + } public static void setFotaServerIP(Context context,String serverIP,int serverPort){ SharPreferenceUtil.setPrefString(context,KeyFotaServerIP,serverIP); diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index ae5f5255..c363fb96 100644 --- 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 { if (Config.c41_branch_name.equals("H88")){ - Config.setLocationMode(this, CUSTOM_MOD); - Config.setLocationCycle(this,3600); - Config.setPPGTestCycle(this,60); - Config.setTemperatureTestCycle(runtime,60); + + if (Config.getH88InitFlag(this)==0) { + Config.setLocationMode(this, CUSTOM_MOD); + Config.setLocationCycle(this, 3600); + Config.setPPGTestCycle(this, 60); + Config.setTemperatureTestCycle(runtime, 60); + Config.setH88InitFlag(this,1); + } } Config.setHeartBeatCycle(this,5); //临时设置为3分钟,给L03测试用。测试断线问题未解决,取消测试。 //初始化ServerHeartBeat Cycle diff --git a/app/version_code.properties b/app/version_code.properties index 13dd8e77..0c27c55f 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Sun Jul 12 22:46:49 CST 2020 -VERSION_CODE=441 +#Sun Jul 12 22:52:23 CST 2020 +VERSION_CODE=442