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; }