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 8812ee6e76..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 = ""; - private static final String HOST_QA = ""; - private static final String HOST_DEMO = ""; - private static final String HOST_RELEASE = ""; + 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/WebSocketManager.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java index 948b9d5208..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 @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static com.mogo.service.connection.WebSocketMsgType.MSG_TYPE_SERVER; +import static com.mogo.service.connection.WebSocketMsgType.MSG_TYPE_DOWNLINK_CAR_DATA; @Keep public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSetting, ISocketMsgCallBack { @@ -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)); } @@ -136,7 +136,7 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin int msgType = webSocketData.getMsgType(); Logger.d(TAG, "websocket received msg type = %d", msgType); //服务端下发数据返回,上传数据回执默认不返回 - if (msgType == MSG_TYPE_SERVER.getMsgType()) { + if (msgType == MSG_TYPE_DOWNLINK_CAR_DATA.getMsgType()) { List listeners = mListeners.get(msgType); if (listeners != null && !listeners.isEmpty()) { Iterator iterator = listeners.iterator(); 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 fb3bcb0769..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,9 +5,15 @@ package com.mogo.service.connection; */ public interface IMogoOnWebSocketMessageListener< T > { - WebSocketMsgType getType(); + WebSocketMsgType getDownLinkType(); - void onMsgReceived(T obj); + WebSocketMsgType getUpLinkType(); - void onError(String errorMsg); + default void onMsgReceived(T obj){ + + } + + default void onError(String errorMsg){ + + } } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/connection/WebSocketMsgType.java b/services/mogo-service-api/src/main/java/com/mogo/service/connection/WebSocketMsgType.java index 5718ac44bc..b0a113d31d 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/connection/WebSocketMsgType.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/connection/WebSocketMsgType.java @@ -2,9 +2,8 @@ package com.mogo.service.connection; public enum WebSocketMsgType { - MSG_TYPE_SELF(0,"自车数据"), - MSG_TYPE_ADAS(1,"ADAS数据"), - MSG_TYPE_SERVER(2,"服务端下发车辆信息"); + MSG_TYPE_UPLINK_CAR_DATA(0,"自车与ADAS数据"), + MSG_TYPE_DOWNLINK_CAR_DATA(1,"服务端下发车辆信息"); private int msgType; private String msg;