From 50856633b03f3ccd433c429bee94ee263b6981f7 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Thu, 24 Mar 2022 19:56:42 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=E8=A7=A3=E5=86=B3=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AF=B9?=
 =?UTF-8?q?=E7=BE=8E=E5=8C=96=E6=A8=A1=E5=BC=8F=E7=8A=B6=E6=80=81=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/telematic/MogoProtocolMsg.java  | 2 ++
 .../src/main/java/com/mogo/telematic/NSDNettyManager.java  | 7 +++++--
 .../mogo/telematic/client/handler/NettyClientHandler.java  | 4 ++--
 .../com/mogo/telematic/client/handler/ReconnectHandler.kt  | 2 +-
 .../src/main/java/com/mogo/telematic/server/NSDServer.java | 4 +++-
 .../telematic/server/netty/MogoProtocolServerHandler.java  | 7 +++++--
 .../com/mogo/telematic/server/netty/NettyTcpServer.java    | 3 ++-
 7 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/MogoProtocolMsg.java b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/MogoProtocolMsg.java
index 79665c5..1bdcea5 100644
--- a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/MogoProtocolMsg.java
+++ b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/MogoProtocolMsg.java
@@ -9,6 +9,8 @@ public class MogoProtocolMsg {
     public static final int NORMAL_DATA = 1;
     // 业务相关的身份注册
     public static final int IDENTITY_REGIST = 2;
+    // 同步美化模式状态
+    public static final int SYNC_MODE_STATUS = 3;
 
     private int protocolType;
     private int bodyLength;
diff --git a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/NSDNettyManager.java b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/NSDNettyManager.java
index d679315..0c8d657 100644
--- a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/NSDNettyManager.java
+++ b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/NSDNettyManager.java
@@ -72,7 +72,6 @@ public class NSDNettyManager {
 
         @Override
         public void onChannelConnect(Channel channel) {
-            NettyTcpServer.getInstance().addChannel(channel);
             if (mListener != null) {
                 mListener.onChannelConnect(channel);
             }
@@ -80,7 +79,6 @@ public class NSDNettyManager {
 
         @Override
         public void onChannelDisConnect(Channel channel) {
-            NettyTcpServer.getInstance().removeChannel(channel);
             if (mListener != null) {
                 mListener.onChannelDisConnect(channel);
             }
@@ -105,6 +103,7 @@ public class NSDNettyManager {
             nettyTcpServer.setListener(mDefaultServerListener);
             nettyTcpServer.start();
         } else {
+            Logger.i(TAG, "服务端已开启，断开连接！");
             NettyTcpServer.getInstance().disconnect();
         }
     }
@@ -126,6 +125,10 @@ public class NSDNettyManager {
         NettyTcpServer.getInstance().sendMsgToAllClients(mogoProtocolMsg);
     }
 
+    public void sendMsgToSpecifiedClient(MogoProtocolMsg mogoProtocolMsg, Channel channel, ChannelFutureListener listener) {
+        NettyTcpServer.getInstance().sendMsgToSpecifiedClient(mogoProtocolMsg, channel, listener);
+    }
+
     /**
      * 服务器端注册一个可供NSD探测到的网络 Ip 地址，便于给展示叫号机连接此socket
      */
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 1675e75..baf788e 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
@@ -71,7 +71,7 @@ public class NettyClientHandler extends SimpleChannelInboundHandler<MogoProtocol
      */
     @Override
     public void channelActive(ChannelHandlerContext ctx) {
-        Logger.e(TAG, "channelActive");
+        Logger.d(TAG, "channelActive");
         listener.onClientStatusConnectChanged(ConnectState.STATUS_CONNECT_SUCCESS, mSign);
     }
 
@@ -110,7 +110,7 @@ public class NettyClientHandler extends SimpleChannelInboundHandler<MogoProtocol
      */
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        Logger.e(TAG, "exceptionCaught");
+        Logger.e(TAG, "NettyClientHandler#exceptionCaught is:" + cause.getMessage());
         listener.onClientStatusConnectChanged(ConnectState.STATUS_CONNECT_ERROR, mSign);
         cause.printStackTrace();
         ctx.close();
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 db455ae..ac8e4ad 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
@@ -32,8 +32,8 @@ class ReconnectHandler(private val mNettyClient: NettyTcpClient) : ChannelInboun
 
     @Throws(Exception::class)
     override fun exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable) {
-        Logger.e(TAG, "exceptionCaught channelId is:${ctx.channel().id()}, cause message is:${cause.message}")
         ctx.close()
+        Logger.e(TAG, "ReconnectHandler#exceptionCaught cause message is:${cause.message}")
     }
 
     @Throws(Exception::class)
diff --git a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/server/NSDServer.java b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/server/NSDServer.java
index 94a55ca..c6d1d81 100644
--- a/libraries/mogo-telematic/src/main/java/com/mogo/telematic/server/NSDServer.java
+++ b/libraries/mogo-telematic/src/main/java/com/mogo/telematic/server/NSDServer.java
@@ -70,7 +70,9 @@ public class NSDServer {
     }
 
     public void stopNSDServer() {
-        mNsdManager.unregisterService(mRegistrationListener);
+        if (mNsdManager != null) {
+            mNsdManager.unregisterService(mRegistrationListener);
+        }
     }
 
 
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 ef66305..f67d61b 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
@@ -25,6 +25,7 @@ public class MogoProtocolServerHandler extends SimpleChannelInboundHandler<MogoP
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx,
                                 Throwable cause) {
+        Logger.e(TAG, "ProtocolServerHandler$exception msg is:" + cause.getMessage());
         cause.printStackTrace();
         ctx.close();
     }
@@ -50,7 +51,8 @@ public class MogoProtocolServerHandler extends SimpleChannelInboundHandler<MogoP
      */
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
-        Logger.e(TAG, "channelActive");
+        Logger.d(TAG, "channelActive");
+        NettyTcpServer.getInstance().addChannel(ctx.channel());
         if (mListener != null) {
             mListener.onChannelConnect(ctx.channel());
         }
@@ -71,9 +73,10 @@ public class MogoProtocolServerHandler extends SimpleChannelInboundHandler<MogoP
 
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-        Logger.e(TAG, "channelInactive");
+        Logger.w(TAG, "channelInactive");
 //        NettyTcpServer.getInstance().setConnectStatus(false);
         NettyTcpServer.getInstance().removeChannelSN(ctx.channel().id());
+        NettyTcpServer.getInstance().removeChannel(ctx.channel());
         if (mListener != null) {
             mListener.onChannelDisConnect(ctx.channel());
         }
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 c77dee2..35a1ef6 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
@@ -149,7 +149,8 @@ public class NettyTcpServer {
     public boolean sendMsgToSpecifiedClient(MogoProtocolMsg mogoProtocolMsg, Channel channel, ChannelFutureListener listener) {
         boolean flag = channel != null && channel.isActive();
         if (flag) {
-            channel.writeAndFlush(mogoProtocolMsg).addListener(listener);
+            ChannelFuture channelFuture = channel.writeAndFlush(mogoProtocolMsg);
+            if (listener != null) channelFuture.addListener(listener);
         }
         return flag;
     }