From 3d23a1fd59383729bd666be94080923fcd2a8629 Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Tue, 9 May 2023 14:59:00 +0800
Subject: [PATCH] =?UTF-8?q?[dev=5Fsweeper=5F3.1.0]=20WebSocket=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=87=E9=92=88=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../support/adas/high/socket/FpgaSocket.java  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java
index 5655f47219..c1ee801deb 100644
--- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java
+++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java
@@ -188,6 +188,7 @@ public class FpgaSocket implements IWebSocket {
         void onWebSocketConnectFailed(String t);
 
         void onMessage(String message);
+
         //TODO 计算耗时 临时测试
         void onMessage(long receiveTime, ByteString bytes) throws InvalidProtocolBufferException;
     }
@@ -366,14 +367,16 @@ public class FpgaSocket implements IWebSocket {
      */
     private void close(boolean isInitiative, int code) {
         isConnected.set(false);
-        String closeReason = null;
-        if (isInitiative) {
-            closeReason = "用户主动关闭";
-        }
-        boolean isClose = mWebSocket.close(code, closeReason);
-        CupidLogUtils.i(TAG, "WebSocket " + (isInitiative ? "主动" : "被动") + "断开连接是否成功= " + isClose);
-        if (!isInitiative) {
-            mWebSocket.cancel();
+        if (mWebSocket != null) {
+            String closeReason = null;
+            if (isInitiative) {
+                closeReason = "用户主动关闭";
+            }
+            boolean isClose = mWebSocket.close(code, closeReason);
+            CupidLogUtils.i(TAG, "WebSocket " + (isInitiative ? "主动" : "被动") + "断开连接是否成功= " + isClose);
+            if (!isInitiative) {
+                mWebSocket.cancel();
+            }
         }
         mWebSocket = null;
     }