From 254d95203b407b37532e584e8ed10b32d980e900 Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Mon, 30 May 2022 19:57:27 +0800
Subject: [PATCH] =?UTF-8?q?[change]=E4=BF=AE=E6=94=B9=E9=87=8D=E8=BF=9E?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8F=AF=E8=83=BD=E5=BC=95=E8=B5=B7=E7=9A=84?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../support/adas/high/socket/FpgaSocket.java  | 39 +++++++------------
 1 file changed, 14 insertions(+), 25 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 c9f786d1ad..61b2c4b619 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
@@ -54,8 +54,6 @@ public class FpgaSocket implements IWebSocket {
     private IWebSocketConnectListener mWebSocketConnectListener;
 
 
-    private OkHttpClient.Builder okBuilder;
-
     private String wsHost;
     private String ipAddress;
     private int port;
@@ -82,25 +80,19 @@ public class FpgaSocket implements IWebSocket {
     }
 
     private void init() {
-        if (listener == null) {
-            listener = new EchoWebSocketListener();
-        }
-        if (okBuilder == null) {
-            okBuilder = new OkHttpClient.Builder();
-            okBuilder.writeTimeout(4, TimeUnit.SECONDS)
-                    .readTimeout(4, TimeUnit.SECONDS)
-                    .connectTimeout(2, TimeUnit.SECONDS);
-            ReceiveTimeoutManager.getInstance().setListener(new ReceiveTimeoutManager.OnTimeoutListener() {
-                @Override
-                public void onTimeout(double time) {
-                    receiveTimeoutReason = "心跳超时（" + time + "秒）";
-                    onPassiveClose(1001, receiveTimeoutReason);
-                }
-            });
-        }
-        if (client == null) {
-            client = okBuilder.build();
-        }
+        listener = new EchoWebSocketListener();
+        OkHttpClient.Builder okBuilder = new OkHttpClient.Builder();
+        okBuilder.writeTimeout(4, TimeUnit.SECONDS)
+                .readTimeout(4, TimeUnit.SECONDS)
+                .connectTimeout(2, TimeUnit.SECONDS);
+        ReceiveTimeoutManager.getInstance().setListener(new ReceiveTimeoutManager.OnTimeoutListener() {
+            @Override
+            public void onTimeout(double time) {
+                receiveTimeoutReason = "心跳超时（" + time + "秒）";
+                onPassiveClose(1001, receiveTimeoutReason);
+            }
+        });
+        client = okBuilder.build();
     }
 
     @Override
@@ -111,12 +103,11 @@ public class FpgaSocket implements IWebSocket {
         isPassiveClose.set(false);
         wsHost = WS_IP_HOST_HEAD + address + String.format(Locale.getDefault(), RESOURCE_PATH, port);
         CupidLogUtils.i(TAG, "WebSocket 主动连接= " + wsHost);
-        init();
         connect("连接中");
     }
 
     private void connect(String msg) {
-        if (client != null && mWebSocket == null) {
+        if (mWebSocket == null) {
             if (mWebSocketConnectListener != null)
                 mWebSocketConnectListener.onConnecting(msg);
             Request request = new Request.Builder()
@@ -157,8 +148,6 @@ public class FpgaSocket implements IWebSocket {
         } else {
             onConnectFailed(null);
         }
-        listener = null;
-        client = null;
     }
 
     @Override