## [1.1.48] version 66 - 2020-08-17

### Changed
- 回退

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 57
+    ext.app_version_code = 66
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.38"
+    ext.app_version = "1.1.48"
 
     /**
      * 项目依赖库

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt

@@ -434,7 +434,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
     }
 
     fun initTcp(){
-        loadingDialog.show()
 
         var count = 10
         Thread(Runnable {
@@ -451,7 +450,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
                 }
                 count--
             }
-            loadingDialog.dismiss()
 
             if (NetHelper.getInstance().getNetworkState(this) == NetHelper.NETWORK_NONE) {
                 runOnUiThread(Runnable {

home/src/main/code/com/wdkl/ncs/android/component/home/service/WdKeepAliveService.kt

@@ -303,7 +303,7 @@ class WdKeepAliveService : AbsWorkService() {
                 if (TcpClient.getInstance().retryTimes < 30) {
                     if (TcpClient.getInstance().channel == null || TcpClient.getInstance().bootstrap == null) {
                         TcpClient.getInstance().init(Constants.tcpServer, Constants.tcpPort, Constants.heartBeat, iTcpCallBack)
-                    } else if (!TcpClient.getInstance().channel.isActive) {
+                    } else {
                         TcpClient.getInstance().doConnect(iTcpCallBack)
                     }
                 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/TcpClient.java

@@ -30,7 +30,7 @@ public class TcpClient {
     //数据处理
     TcpClientHandler tcpClientHandler = new TcpClientHandler();
     //重试间隔
-    private Integer retrySeconds = 5;
+    private Integer retrySeconds = 3;
     //重试计数
     public Integer retryTimes = 1;
 
@@ -46,10 +46,10 @@ public class TcpClient {
 
     //初始化Netty Tcp Client 并连接
     public synchronized void init(String serverIP, Integer serverPort, Integer heartBeatSeconds, ITcpCallBack iTcpCallBack) {
-//        if (bootstrap!=null){
-//            doConnect(iTcpCallBack);
-//            return;
-//        }
+        if (bootstrap!=null){
+            doConnect(iTcpCallBack);
+            return;
+        }
 
         final Integer hbSeconds = heartBeatSeconds;
         bootstrap = new Bootstrap();

readme.md

@@ -26,6 +26,12 @@
 
 ---
 
+## [1.1.48] version 66 - 2020-08-17
+### Changed
+- 回退
+
+---
+
 ## [1.1.38] version 57 - 2020-08-13
 ### Fixed
 - 打开界面连接tcp时出错重启APP