From 313e0b01019fc8b5e1836cefc08162a9286840d5 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Fri, 1 Sep 2023 19:15:02 +0800 Subject: [PATCH] =?UTF-8?q?[600][adas]=E4=BF=AE=E5=A4=8DWebSocket=E9=87=8D?= =?UTF-8?q?=E8=BF=9E=E5=81=9C=E6=AD=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhidao/support/adas/high/socket/FpgaSocket.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 db46b1aee8..9ba4c32a95 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 @@ -1,7 +1,5 @@ package com.zhidao.support.adas.high.socket; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_WEB_SOCKET_MESSAGE_BYTE; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_WEB_SOCKET_MESSAGE_JSON; import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_WEB_SOCKET_OPEN; import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_SOURCE_ADAS; import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_TYPE_INIT_STATUS; @@ -25,6 +23,7 @@ import com.zhidao.support.adas.high.queue.WebSocketQueueManager; import com.zhjt.service.chain.ChainLog; import java.util.Locale; +import java.util.Random; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -33,6 +32,7 @@ import okhttp3.Request; import okhttp3.Response; import okhttp3.WebSocket; import okhttp3.WebSocketListener; +import okhttp3.internal.ws.RealWebSocket; import okio.ByteString; /** @@ -51,7 +51,7 @@ public class FpgaSocket implements IWebSocket { private static final String TAG = FpgaSocket.class.getSimpleName(); private OkHttpClient client; - private volatile WebSocket mWebSocket; + private volatile RealWebSocket mWebSocket; private EchoWebSocketListener listener; private IWebSocketConnectListener mWebSocketConnectListener; @@ -123,7 +123,9 @@ public class FpgaSocket implements IWebSocket { Request request = new Request.Builder() .url(wsHost) .build(); - mWebSocket = client.newWebSocket(request, listener); + mWebSocket = new RealWebSocket(request, listener, new Random(), 0); + mWebSocket.connect(client); +// mWebSocket = client.newWebSocket(request, listener); } }