Explorar o código

## [1.1.53] version 71 - 2020-08-21
### Changed
- 改善TCP重连

allen %!s(int64=3) %!d(string=hai) anos
pai
achega
fb8736102c

BIN=BIN
.gradle/4.10.1/fileHashes/fileHashes.bin


BIN=BIN
.gradle/4.10.1/fileHashes/fileHashes.lock


BIN=BIN
.gradle/4.10.1/fileHashes/resourceHashesCache.bin


BIN=BIN
.gradle/4.10.1/javaCompile/classAnalysis.bin


BIN=BIN
.gradle/4.10.1/javaCompile/javaCompile.lock


BIN=BIN
.gradle/4.10.1/javaCompile/taskHistory.bin


BIN=BIN
.gradle/4.10.1/taskHistory/taskHistory.bin


BIN=BIN
.gradle/4.10.1/taskHistory/taskHistory.lock


+ 2 - 2
build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 70
+    ext.app_version_code = 71
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.52"
+    ext.app_version = "1.1.53"
 
     /**
      * 项目依赖库

+ 1 - 4
home/src/main/code/com/wdkl/ncs/android/component/home/service/WdKeepAliveService.kt

@@ -312,10 +312,7 @@ class WdKeepAliveService : AbsWorkService() {
                 Log.w(TAG, "断网唤醒CPU")
 //                val wakeLock = Util.wakeUpAndUnlock(this@WdKeepAliveService)
                 if (TcpClient.getInstance().retryTimes < 30) {
-                    if (TcpClient.getInstance().channel == null || TcpClient.getInstance().bootstrap == null) {
-//                        TcpClient.getInstance().doConnect(iTcpCallBack)
-                       TcpClient.getInstance().init(Constants.tcpServer, Constants.tcpPort, Constants.heartBeat, iTcpCallBack)
-                    }
+                   TcpClient.getInstance().init(Constants.tcpServer, Constants.tcpPort, Constants.heartBeat, iTcpCallBack)
                 } else {
                     AppUtils.restartApp()
                 }

+ 0 - 2
middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/TcpClientHandler.java

@@ -130,8 +130,6 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
                 if (retrySendMsg < 3){
                     retrySendMsg++;
                     sendMsg(msg);
-                } else {
-                    ctx.close();    //主动断线
                 }
             }
         }).start();

+ 6 - 0
readme.md

@@ -26,6 +26,12 @@
 
 ---
 
+## [1.1.53] version 71 - 2020-08-21
+### Changed
+- 改善TCP重连
+
+---
+
 ## [1.1.52] version 70 - 2020-08-21
 ### Changed
 - 改善TCP重连