release V395

1、修复 混淆造成的release版本运行出错。
2、取消 服务端主动断开网络的检测，因为经测试没有实际作用。

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 22548cd..ff91061 100644 (file)
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -160,4 +160,5 @@
 -keep class com.ic.** { *; }
 -keep class com.enqualcomm.** { *; }
 -keep class com.sina.util.dnscache.** { *; }
--keep class rx.internal.**  { *; }
\ No newline at end of file
+-keep class rx.internal.**  { *; }
+-keep class java.util.concurrent.**  { *; }
\ No newline at end of file

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

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

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

diff --git a/app/version_code.properties b/app/version_code.properties
index 976f79e..5dff3e5 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Apr 07 17:52:51 CST 2020\r
-VERSION_CODE=393\r
+#Tue Apr 07 18:32:46 CST 2020\r
+VERSION_CODE=395\r