优化tcp

修改显示gug

.idea/misc.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Mar 08 20:44:19 CST 2021
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

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

@@ -307,7 +307,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         Constants.sip_id = data.sipId
         Constants.sip_password = data.sipPassword
         Constants.user_name = data.memberName
-        Constants.user_role_name = data.name
+        Constants.user_role_name = data.roleName
 
         if (TextUtils.isEmpty(Constants.ids) || TextUtils.isEmpty(Constants.sip_id)
 //                || TextUtils.isEmpty(Constants.user_name)

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

@@ -61,7 +61,7 @@ public class TcpClient {
                         // LengthFieldPrepender是一个编码器，主要是在响应字节数据前面添加字节长度字段
                         socketChannel.pipeline().addLast(new LengthFieldPrepender(2));
                         //心跳包应当小于服务器间隔
-                        socketChannel.pipeline().addLast(new IdleStateHandler(hbSeconds+1, hbSeconds, 0, TimeUnit.SECONDS));
+                        socketChannel.pipeline().addLast(new IdleStateHandler(hbSeconds*2, hbSeconds, 0, TimeUnit.SECONDS));
                         socketChannel.pipeline().addLast(new StringDecoder(CharsetUtil.UTF_8));
                         socketChannel.pipeline().addLast(new StringEncoder(CharsetUtil.UTF_8));
                         socketChannel.pipeline().addLast(tcpClientHandler);

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

@@ -47,6 +47,9 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
         connected = true;
         connecteds = true;
         retryTimes = 0;
+//        TcpModel tcpModel = DeviceUtil.deviceConnect(Constants.Companion.getImei());
+//        TcpClient.getInstance().sendMsg(tcpModel.toJson());
+
         TcpModel tcpModel = DeviceUtil.deviceConnect(Constants.Companion.getImei());
         TcpClient.getInstance().sendMsg(tcpModel.toJson());
 //        EventBus.getDefault().register(this);
@@ -92,8 +95,7 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
               //读心跳包超时执行
             }else if (event.state() == IdleState.READER_IDLE){
                 Log.i(TAG,"TcpClientHandler ===> pong from server failed");
-               ctx.writeAndFlush("0");
-//                ctx.close();
+                ctx.close();
             }
         }
     }

rtc-chat/src/main/java/com/wdkl/skywebrtc/engine/webrtc/WebRTCEngine.java

@@ -65,7 +65,7 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
 
 
     // 服务器实例列表
-    private String serverIP = "8.129.220.143";
+    private String serverIP = "120.76.246.253";
     private String turnUser = "dsg";
     private String turnUserPwd = "123456";