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..642645d516 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 { @@ -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..d78e830f3f 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 @@ -7,7 +7,11 @@ public interface IMogoOnWebSocketMessageListener< T > { WebSocketMsgType getType(); - void onMsgReceived(T obj); + default void onMsgReceived(T obj){ - void onError(String errorMsg); + } + + 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;