From 357cc49845bed50340106c72895a0e4d9a0ff7c6 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Wed, 6 Apr 2022 20:33:52 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/telematic/client/NettyTcpClient.java | 1 -
 .../com/mogo/telematic/client/handler/NettyClientHandler.java   | 1 -
 .../java/com/mogo/telematic/client/handler/ReconnectHandler.kt  | 1 -
 .../mogo/telematic/server/netty/MogoProtocolServerHandler.java  | 1 -
 .../java/com/mogo/telematic/server/netty/NettyTcpServer.java    | 2 +-
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/client/NettyTcpClient.java b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/client/NettyTcpClient.java
index 5250a09..0d46b1b 100644
--- a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/client/NettyTcpClient.java
+++ b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/client/NettyTcpClient.java
@@ -211,7 +211,6 @@ public class NettyTcpClient {
     }
 
     public void reconnectServer() {
-        Log.d(TAG, "ReconnectServer function is called.");
         if (!TextUtils.isEmpty(host)) {
             doConnect();
         }
diff --git a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/client/handler/NettyClientHandler.java b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/client/handler/NettyClientHandler.java
index ef87137..47d8464 100644
--- a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/client/handler/NettyClientHandler.java
+++ b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/client/handler/NettyClientHandler.java
@@ -93,7 +93,6 @@ public class NettyClientHandler extends SimpleChannelInboundHandler<MogoProtocol
      */
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, MogoProtocolMsg msg) throws Exception {
-        Logger.d(TAG, "Client channelRead0:" + msg.toString());
         if (msg.getProtocolType() == MogoProtocolMsg.IDENTITY_REGIST) {
             String sn = new String(msg.getBody());
             NettyTcpClient.sSERVER_SN = sn;
diff --git a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/client/handler/ReconnectHandler.kt b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/client/handler/ReconnectHandler.kt
index ac8e4ad..dac3882 100644
--- a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/client/handler/ReconnectHandler.kt
+++ b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/client/handler/ReconnectHandler.kt
@@ -56,7 +56,6 @@ class ReconnectHandler(private val mNettyClient: NettyTcpClient) : ChannelInboun
             }
             Logger.d(TAG, "${sleepTimeMs}ms后执行重连操作！")
             scheduledThreadPool.schedule({
-                Logger.d(TAG, "Reconnecting server ...")
                 // 异步重连或单独线程池中同步重连，不要阻塞netty的io线程，同时也不要关闭EventLoopGroup
                 mNettyClient.reconnectServer()
             }, sleepTimeMs, TimeUnit.MILLISECONDS)
diff --git a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/server/netty/MogoProtocolServerHandler.java b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/server/netty/MogoProtocolServerHandler.java
index f67d61b..aeadf68 100644
--- a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/server/netty/MogoProtocolServerHandler.java
+++ b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/server/netty/MogoProtocolServerHandler.java
@@ -32,7 +32,6 @@ public class MogoProtocolServerHandler extends SimpleChannelInboundHandler<MogoP
 
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, MogoProtocolMsg msg) throws Exception {
-        Logger.d(TAG, "server$channelRead0():" + msg.toString());
         if (msg.getProtocolType() == MogoProtocolMsg.IDENTITY_REGIST) {
             String sn = new String(msg.getBody());
             NettyTcpServer.getInstance().putChannelSN(ctx.channel().id(), sn);
diff --git a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/server/netty/NettyTcpServer.java b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/server/netty/NettyTcpServer.java
index 35a1ef6..df7ffa9 100644
--- a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/server/netty/NettyTcpServer.java
+++ b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/server/netty/NettyTcpServer.java
@@ -158,7 +158,7 @@ public class NettyTcpServer {
     public void sendMsgToAllClients(MogoProtocolMsg mogoProtocolMsg) {
         for (Channel chl : channelList) {
             if (chl != null && chl.isActive()) {
-                chl.writeAndFlush(mogoProtocolMsg).addListener(mProxyListener);
+                chl.writeAndFlush(mogoProtocolMsg);
             }
         }
     }