From 19c4859a716a425598b0bfaeed25d83ce1a70271 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 27 Oct 2020 10:11:09 +0800 Subject: [PATCH] fix bug --- .../java/com/mogo/base/websocket/WebSocketManager.java | 10 +++++----- .../connection/IMogoOnWebSocketMessageListener.java | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) 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 642645d516..ac6cfd162b 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 @@ -72,11 +72,11 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin @Override public void registerOnWebSocketMessageListener(IMogoOnWebSocketMessageListener listener) { - if (listener.getType() == null) { + if (listener.getDownLinkType() == null) { Logger.w(TAG, "websocket registerListener msgType is not exist"); return; } - int msgType = listener.getType().getMsgType(); + int msgType = listener.getDownLinkType().getMsgType(); if (mListeners.containsKey(msgType)) { Logger.w(TAG, "websocket msgType %d is exist.", msgType); } @@ -92,11 +92,11 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin if (listener == null) { return; } - if (listener.getType() == null) { + if (listener.getDownLinkType() == null) { Logger.w(TAG, "websocket unregisterListener msgType is not exist"); return; } - int msgType = listener.getType().getMsgType(); + int msgType = listener.getDownLinkType().getMsgType(); if (!mListeners.containsKey(msgType)) { return; } @@ -113,7 +113,7 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin if (handlerThread != null) { WebSocketData webSocketData = new WebSocketData(); webSocketData.setSeq(System.currentTimeMillis()); - webSocketData.setMsgType(listener.getType().getMsgType()); + webSocketData.setMsgType(listener.getUpLinkType().getMsgType()); webSocketData.setT(body); handlerThread.sendMsg(new Gson().toJson(webSocketData)); } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/connection/IMogoOnWebSocketMessageListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/connection/IMogoOnWebSocketMessageListener.java index d78e830f3f..f87217768d 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/connection/IMogoOnWebSocketMessageListener.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/connection/IMogoOnWebSocketMessageListener.java @@ -5,7 +5,9 @@ package com.mogo.service.connection; */ public interface IMogoOnWebSocketMessageListener< T > { - WebSocketMsgType getType(); + WebSocketMsgType getDownLinkType(); + + WebSocketMsgType getUpLinkType(); default void onMsgReceived(T obj){