release V393

1、添加白名单控制，设置 persist.sys.whitelist.enable
2、服务器主动断开链接的话，还是重试3次，如果3次都不能重连成功，则停止重连。等待下一次网络链接变化等消息触发链接服务器

diff --git a/app/release/ICSer_V391_2004031426_release.apk b/app/release/ICSer_V391_2004031426_release.apk
deleted file mode 100644 (file)
index 1fc47c9..0000000
Binary files a/app/release/ICSer_V391_2004031426_release.apk and /dev/null differ

diff --git a/app/release/ICSer_V393_2004071752_release.apk b/app/release/ICSer_V393_2004071752_release.apk
new file mode 100644 (file)
index 0000000..3d023c1
Binary files /dev/null and b/app/release/ICSer_V393_2004071752_release.apk differ

diff --git a/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java b/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java
index 24c957d..2bde14d 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java
@@ -1286,7 +1286,14 @@ public static String AP15(String index){
             String index=list[2];\r
             String whitelist_switch=list[3];\r
             connection.send(protocolAPIHelper.genStringMessage("AP84",AP84(index,1)));\r
+\r
+            if (whitelist_switch.equals("1")){\r
+                Util.setSystemProperties("persist.sys.whitelist.enable","true");\r
+            }else{\r
+                Util.setSystemProperties("persist.sys.whitelist.enable","false");\r
+            }\r
             ICLogger.i("收到服务器指令：白名单"+(whitelist_switch.equals("1")?"开":"关"));\r
+\r
         }else{\r
 \r
             ICLogger.i("BP84 format error!");\r

diff --git a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
index be1c1bd..473cf10 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
+++ b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
@@ -40,6 +40,7 @@ public class KeepAlive extends AbstractConnectionService {
   \r
   private static boolean isInSleepMode = false;\r
 \r
+  private static int mDisconnectByServerCount=0;\r
   Connection connection;\r
   \r
   Context mContext;\r
@@ -179,10 +180,16 @@ public class KeepAlive extends AbstractConnectionService {
 //    if (isConnected)\r
     //如果KeepAlive被关闭说明网络有问题，因此开启重试联网机制\r
     stopResponseCheckTimer();\r
-    if (!ErrorMsg.equals("DIS_CONNECT_BY_SERVERSIDE")){\r
+    if (ErrorMsg.equals("DIS_CONNECT_BY_SERVERSIDE")){\r
+      if(mDisconnectByServerCount < 3){//被服务器拒绝连续拒绝3次后才停止重试\r
         CoreService.getInstance().startConnectionRetryTimer();\r
+      }else {\r
+        ICLogger.i("服务器主动断开超过连续3次，IMEI不对或者命令格式错误！停止重试连接服务器，等待重启或者下一次网络重连。");\r
+      }\r
+      mDisconnectByServerCount++;\r
     }else{\r
-        ICLogger.i("服务器主动断开，IMEI不对或者命令格式错误！停止重试连接服务器，等待重启或者下一次网络重连。");\r
+      mDisconnectByServerCount=0; //如果不是被服务器拒绝，则重置 计数。\r
+      CoreService.getInstance().startConnectionRetryTimer();\r
     }\r
     connectionError = true;\r
     isConnected = false;\r

diff --git a/app/version_code.properties b/app/version_code.properties
index de8702a..976f79e 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Apr 03 14:26:47 CST 2020\r
-VERSION_CODE=391\r
+#Tue Apr 07 17:52:51 CST 2020\r
+VERSION_CODE=393\r