From: snickersun <scy@incartech.cn>
Date: Tue, 7 Apr 2020 09:55:35 +0000 (+0800)
Subject: release V393
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=a0146dff9e010499cccf79d863f4e64db7ef7a43;p=icsupport.git

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
index 1fc47c98..00000000
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
index 00000000..3d023c16
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 24c957d9..2bde14da 100644
--- 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];
             String whitelist_switch=list[3];
             connection.send(protocolAPIHelper.genStringMessage("AP84",AP84(index,1)));
+
+            if (whitelist_switch.equals("1")){
+                Util.setSystemProperties("persist.sys.whitelist.enable","true");
+            }else{
+                Util.setSystemProperties("persist.sys.whitelist.enable","false");
+            }
             ICLogger.i("收到服务器指令：白名单"+(whitelist_switch.equals("1")?"开":"关"));
+
         }else{
 
             ICLogger.i("BP84 format error!");
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 be1c1bdf..473cf10b 100644
--- 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 {
   
   private static boolean isInSleepMode = false;
 
+  private static int mDisconnectByServerCount=0;
   Connection connection;
   
   Context mContext;
@@ -179,10 +180,16 @@ public class KeepAlive extends AbstractConnectionService {
 //    if (isConnected)
     //如果KeepAlive被关闭说明网络有问题，因此开启重试联网机制
     stopResponseCheckTimer();
-    if (!ErrorMsg.equals("DIS_CONNECT_BY_SERVERSIDE")){
+    if (ErrorMsg.equals("DIS_CONNECT_BY_SERVERSIDE")){
+      if(mDisconnectByServerCount < 3){//被服务器拒绝连续拒绝3次后才停止重试
         CoreService.getInstance().startConnectionRetryTimer();
+      }else {
+        ICLogger.i("服务器主动断开超过连续3次，IMEI不对或者命令格式错误！停止重试连接服务器，等待重启或者下一次网络重连。");
+      }
+      mDisconnectByServerCount++;
     }else{
-        ICLogger.i("服务器主动断开，IMEI不对或者命令格式错误！停止重试连接服务器，等待重启或者下一次网络重连。");
+      mDisconnectByServerCount=0; //如果不是被服务器拒绝，则重置 计数。
+      CoreService.getInstance().startConnectionRetryTimer();
     }
     connectionError = true;
     isConnected = false;
diff --git a/app/version_code.properties b/app/version_code.properties
index de8702ae..976f79e6 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Apr 03 14:26:47 CST 2020
-VERSION_CODE=391
+#Tue Apr 07 17:52:51 CST 2020
+VERSION_CODE=393