diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 1563bc1..8116b81 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -26,6 +26,7 @@ diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java index 94013bb..078e5e0 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java @@ -63,7 +63,7 @@ public class LiveStreamManagerImpl implements ILiveStreamManager { new IMogoCloudSocketOnMessageListener() { @Override - public Class target() { + public Class target(int msgType) { return CommandModel.class; } diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/IMogoCloudSocketOnMessageListener.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/IMogoCloudSocketOnMessageListener.java index 816b615..bae3066 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/IMogoCloudSocketOnMessageListener.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/IMogoCloudSocketOnMessageListener.java @@ -7,9 +7,10 @@ public interface IMogoCloudSocketOnMessageListener { /** * 获取解析实例对象 + * @param msgType 消息类型 * @return class */ - Class target(); + Class target(int msgType); /** * 消息接收回调 diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java index 2989400..036c6a6 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java @@ -83,7 +83,6 @@ public class SocketManager implements IMogoCloudSocketManager, Callback { .setClient(Platform.getClient(Platform.car)) .setChannelId(SocketServicesConstants.SOCKET_CHANNEL_ID) .setOpenAnalytics(true) - // TODO 这里先用设备ID,原因是因为后台分配的SN与蘑菇自研车机SN不符合导致在线及推送有问题 .setSn(cloudClientConfig.getThirdPartyDeviceId()) .setToken(cloudClientConfig.getToken()) .setAuthPubKey(cloudClientConfig.getAuthPubKey()) @@ -144,7 +143,7 @@ public class SocketManager implements IMogoCloudSocketManager, Callback { while (iterator.hasNext()) { IMogoCloudSocketOnMessageListener listener = iterator.next(); if (object == null) { - object = GsonUtil.objectFromJson(payload.getPayload().toStringUtf8(), listener.target()); + object = GsonUtil.objectFromJson(payload.getPayload().toStringUtf8(), listener.target(msgType)); } if (listener != null) { Logger.d(TAG, "received msgId = %s, content = %s", msgId, payload.getPayload().toStringUtf8()); diff --git a/gradle.properties b/gradle.properties index 8a3409b..b20a218 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,20 +30,20 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.0.28-SNAPSHOT +MOGO_UTILS_VERSION=1.0.30-SNAPSHOT # 网络请求 -MOGO_NETWORK_VERSION=1.0.28-SNAPSHOT +MOGO_NETWORK_VERSION=1.0.30-SNAPSHOT # 网络DNS -MOGO_HTTPDNS_VERSION=1.0.28-SNAPSHOT +MOGO_HTTPDNS_VERSION=1.0.30-SNAPSHOT # 鉴权 -MOGO_PASSPORT_VERSION=1.0.28-SNAPSHOT +MOGO_PASSPORT_VERSION=1.0.30-SNAPSHOT # 常链接 -MOGO_SOCKET_VERSION=1.0.28-SNAPSHOT +MOGO_SOCKET_VERSION=1.0.30-SNAPSHOT # 数据采集 -MOGO_REALTIME_VERSION=1.0.28-SNAPSHOT +MOGO_REALTIME_VERSION=1.0.30-SNAPSHOT # 探路,道路事件发布,获取 -MOGO_TANLU_VERSION=1.0.28-SNAPSHOT +MOGO_TANLU_VERSION=1.0.30-SNAPSHOT # 直播推流 -MOGO_LIVE_VERSION=1.0.28-SNAPSHOT +MOGO_LIVE_VERSION=1.0.30-SNAPSHOT # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.0.28-SNAPSHOT +MOGO_TRAFFICLIVE_VERSION=1.0.30-SNAPSHOT diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java index a3159bf..fb5f098 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java @@ -89,7 +89,7 @@ public class SocketHandler { private final IMogoCloudSocketOnMessageListener onMessageListener = new IMogoCloudSocketOnMessageListener() { @Override - public Class target() { + public Class target(int msgType) { return WebSocketData.class; }