## [1.1.59] version 77 - 2020-08-24

### Fixed
- 优化TCP连通

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 76
+    ext.app_version_code = 77
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.58"
+    ext.app_version = "1.1.59"
 
     /**
      * 项目依赖库

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

@@ -317,7 +317,7 @@ class WdKeepAliveService : AbsWorkService() {
                     AppUtils.restartApp()
                 }
             } else {
-                TcpClient.getInstance().sendMsg("0")
+                //TcpClient.getInstance().sendMsg("0")
                 if (SocketManager.getInstance().connectFlag) {
                     EventBus.getDefault().post(MessageEvent(TcpModel(), Constants.EVENT_RTC_STATE))
                 } else {

home/src/main/code/com/wdkl/ncs/android/component/home/util/TcpCallbackImpl.java

@@ -5,6 +5,10 @@ import com.wdkl.core.consts.Urls;
 import com.wdkl.core.socket.SocketManager;
 import com.wdkl.ncs.android.component.nursehome.common.Constants;
 import com.wdkl.ncs.android.middleware.tcp.ITcpCallBack;
+import com.wdkl.ncs.android.middleware.tcp.TcpClient;
+import com.wdkl.ncs.android.middleware.tcp.TcpClientHandler;
+import com.wdkl.ncs.android.middleware.tcp.channel.DeviceUtil;
+import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -14,5 +18,19 @@ public class TcpCallbackImpl implements ITcpCallBack {
         if (!Strings.isNullOrEmpty(Constants.Companion.getSipId()) && SocketManager.getInstance().getUserState()!=1) {
             SocketManager.getInstance().connect(Urls.WS, Constants.Companion.getSipId(), 0);
         }
+
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                while (!TcpClientHandler.getConnected()){
+                    try {
+                        Thread.sleep(1000);
+                    }catch (Exception ex){}
+                }
+                TcpModel tcpModel = DeviceUtil.deviceConnect(Constants.Companion.getImei());
+                TcpClient.getInstance().sendMsg(tcpModel.toJson());
+            }
+        }).start();
+
     }
 }

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

@@ -160,13 +160,9 @@ public class TcpClient {
     }
 
     //发送消息，线程安全
-    public synchronized void sendMsg(String content) {
+    public synchronized void sendMsg(final String content) {
         Log.d(TAG, "准备发送的数据 " + content);
-        if (tcpClientHandler != null) {
-            tcpClientHandler.sendMsg(content);
-        } else {
-            Log.d(TAG, "未能发送数据 " + content);
-        }
+        tcpClientHandler.sendMsg(content);
     }
 
     //测试

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

@@ -117,9 +117,9 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
         if (ctx!=null && ctx.channel().isActive()){
             ctx.writeAndFlush(Unpooled.copiedBuffer(msg, CharsetUtil.UTF_8));
             Log.i(TAG,"TcpClientHandler 发送成功：" + msg);
-            return;
         }
         //掉线后的消息处理
+        /*
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -133,6 +133,7 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
                 }
             }
         }).start();
+         */
     }
 
     //已经连接上，中途失去连接时的处理

readme.md

@@ -26,6 +26,13 @@
 
 ---
 
+## [1.1.59] version 77 - 2020-08-24
+### Fixed
+- 优化TCP连通
+
+---
+
+
 ## [1.1.58] version 76 - 2020-08-23
 ### Fixed
 - 优化通话连接