From e3605a5cb49a045ad5e520c6ab0dbfa4237300e2 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 27 Oct 2020 17:25:40 +0800 Subject: [PATCH] opt websocket --- .../java/com/mogo/base/websocket/WebSocketConstant.java | 8 ++++---- .../com/mogo/base/websocket/WebSocketHandlerThread.java | 6 +++--- .../java/com/mogo/base/websocket/WebSocketManager.java | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java index 67cd191240..7d080b3254 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java @@ -5,10 +5,10 @@ import com.mogo.commons.debug.DebugConfig; public class WebSocketConstant { - private static final String HOST_DEV = "ws://62.234.196.121:4001/ws"; - private static final String HOST_QA = "ws://62.234.196.121:4001/ws"; - private static final String HOST_DEMO = "ws://62.234.196.121:4001/ws"; - private static final String HOST_RELEASE = "ws://62.234.196.121:4001/ws"; + private static final String HOST_DEV = "ws://62.234.196.121:14001/ws"; + private static final String HOST_QA = "ws://62.234.196.121:14001/ws"; + private static final String HOST_DEMO = "ws://62.234.196.121:14001/ws"; + private static final String HOST_RELEASE = "ws://62.234.196.121:14001/ws"; public static String getSocketServer(){ switch (DebugConfig.getNetMode()){ diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketHandlerThread.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketHandlerThread.java index bf17ae09c5..4343842f8c 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketHandlerThread.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketHandlerThread.java @@ -19,9 +19,8 @@ public class WebSocketHandlerThread extends HandlerThread { tag = name; } - @Override - public void run() { - super.run(); + + public void initHandler(){ mHandler = new Handler(this.getLooper()) { @Override public void handleMessage(Message msg) { @@ -34,6 +33,7 @@ public class WebSocketHandlerThread extends HandlerThread { }; } + public void sendMsg(String msg) { if(mHandler!=null) { Message message = new Message(); diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java index bcafbca657..7c5854d356 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java @@ -35,6 +35,7 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin public WebSocketManager(Context context) { handlerThread = new WebSocketHandlerThread(TAG); handlerThread.start(); + handlerThread.initHandler(); } @Keep @@ -154,6 +155,7 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin @Override public void onConnectClose() { Logger.d(TAG, "websocket ready to reconnect"); + SocketClient.getInstance().getClientProxy().stop(); SocketClient.getInstance().getClientProxy().reConnect(); }