yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map

Browse Source
This commit is contained in:
tongchenfei
2020-10-27 10:11:56 +08:00
parent c7fbc3a6c6 19c4859a71
commit 568c119a0a
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java
View File

@@ -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()){

14
foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java
View File

@@ -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<IMogoOnWebSocketMessageListener> listeners = mListeners.get(msgType);
if (listeners != null && !listeners.isEmpty()) {
Iterator<IMogoOnWebSocketMessageListener> iterator = listeners.iterator();

12
services/mogo-service-api/src/main/java/com/mogo/service/connection/IMogoOnWebSocketMessageListener.java
View File

@@ -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){
}
}

5
services/mogo-service-api/src/main/java/com/mogo/service/connection/WebSocketMsgType.java
View File

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