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 84272ff..7ebe971 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 @@ -6,6 +6,7 @@ import android.support.annotation.NonNull; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; +import com.mogo.cloud.GsonUtil; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.cloud.socket.entity.MsgBody; @@ -130,15 +131,20 @@ public class SocketManager implements IMogoCloudSocketManager { } cacheLastReceivedMsgId(msgId); } - SocketDownData.SocketDownDataProto proto3 = null; + Object obj = null; while (iterator.hasNext()) { IMogoCloudSocketOnMessageListener listener = iterator.next(); if (payload.getPayload() != null) { - proto3 = SocketDownData.SocketDownDataProto.parseFrom(payload.getPayload()); + Class clz = listener.target(msgType); + if (clz.isInstance(SocketDownData.class)) { + obj = SocketDownData.SocketDownDataProto.parseFrom(payload.getPayload()); + }else{ + obj = GsonUtil.objectFromJson(payload.getPayload().toStringUtf8(), listener.target(msgType)); + } } if (listener != null) { Logger.d(TAG, "received msgId = %s, content = %s", msgId, payload.getPayload().toStringUtf8()); - listener.onMsgReceived(msgType, proto3); + listener.onMsgReceived(msgType, obj); } } } diff --git a/gradle.properties b/gradle.properties index b8504ff..64d86d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,20 +30,20 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.1.9 +MOGO_UTILS_VERSION=1.1.10 # 网络请求 -MOGO_NETWORK_VERSION=1.1.9 +MOGO_NETWORK_VERSION=1.1.10 # 网络DNS -MOGO_HTTPDNS_VERSION=1.1.9 +MOGO_HTTPDNS_VERSION=1.1.10 # 鉴权 -MOGO_PASSPORT_VERSION=1.1.9 +MOGO_PASSPORT_VERSION=1.1.10 # 常链接 -MOGO_SOCKET_VERSION=1.1.9 +MOGO_SOCKET_VERSION=1.1.10 # 数据采集 -MOGO_REALTIME_VERSION=1.1.9 +MOGO_REALTIME_VERSION=1.1.10 # 探路,道路事件发布,获取 -MOGO_TANLU_VERSION=1.1.9 +MOGO_TANLU_VERSION=1.1.10 # 直播推流 -MOGO_LIVE_VERSION=1.1.9 +MOGO_LIVE_VERSION=1.1.10 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.1.9 +MOGO_TRAFFICLIVE_VERSION=1.1.10