From 37a914175121088118b7104465e17beecb88fd0a Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 22 Feb 2021 16:46:14 +0800 Subject: [PATCH] extends socket interface --- .../live/manager/LiveStreamManagerImpl.java | 2 +- .../IMogoCloudSocketOnMessageListener.java | 3 ++- .../com/mogo/cloud/socket/SocketManager.java | 4 ++-- gradle.properties | 18 +++++++++--------- .../mogo/realtime/socket/SocketHandler.java | 7 +++---- 5 files changed, 17 insertions(+), 17 deletions(-) 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 078e5e0..f508190 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 @@ -68,7 +68,7 @@ public class LiveStreamManagerImpl implements ILiveStreamManager { } @Override - public void onMsgReceived(CommandModel obj) { + public void onMsgReceived(int msgType, CommandModel obj) { Logger.i(TAG, "onMsgReceived: obj=" + obj + " systemClock :" + SystemClock.elapsedRealtime() + " SystemTime : " + System.currentTimeMillis()); livePushHandler(obj.getType(), obj.getVideoChannel()); } 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 bae3066..d8258b6 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 @@ -14,7 +14,8 @@ public interface IMogoCloudSocketOnMessageListener { /** * 消息接收回调 + * @param msgType 消息类型 * @param obj T 业务bean数据 */ - void onMsgReceived(T obj); + void onMsgReceived(int msgType, T obj); } 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 036c6a6..b726cd3 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,9 +6,9 @@ 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.GsonUtil; import com.mogo.cloud.utils.logger.Logger; import com.zhidao.locupload.Platform; import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon; @@ -147,7 +147,7 @@ public class SocketManager implements IMogoCloudSocketManager, Callback { } if (listener != null) { Logger.d(TAG, "received msgId = %s, content = %s", msgId, payload.getPayload().toStringUtf8()); - listener.onMsgReceived(object); + listener.onMsgReceived(msgType, object); } } } diff --git a/gradle.properties b/gradle.properties index b20a218..67a55cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,20 +30,20 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.0.30-SNAPSHOT +MOGO_UTILS_VERSION=1.0.31-SNAPSHOT # 网络请求 -MOGO_NETWORK_VERSION=1.0.30-SNAPSHOT +MOGO_NETWORK_VERSION=1.0.31-SNAPSHOT # 网络DNS -MOGO_HTTPDNS_VERSION=1.0.30-SNAPSHOT +MOGO_HTTPDNS_VERSION=1.0.31-SNAPSHOT # 鉴权 -MOGO_PASSPORT_VERSION=1.0.30-SNAPSHOT +MOGO_PASSPORT_VERSION=1.0.31-SNAPSHOT # 常链接 -MOGO_SOCKET_VERSION=1.0.30-SNAPSHOT +MOGO_SOCKET_VERSION=1.0.31-SNAPSHOT # 数据采集 -MOGO_REALTIME_VERSION=1.0.30-SNAPSHOT +MOGO_REALTIME_VERSION=1.0.31-SNAPSHOT # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.0.30-SNAPSHOT +MOGO_TANLU_VERSION=1.0.31-SNAPSHOT # 直播推流 -MOGO_LIVE_VERSION=1.0.30-SNAPSHOT +MOGO_LIVE_VERSION=1.0.31-SNAPSHOT # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.0.30-SNAPSHOT +MOGO_TRAFFICLIVE_VERSION=1.0.31-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 fb5f098..c85daca 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 @@ -3,11 +3,13 @@ package com.mogo.realtime.socket; import android.content.Context; import android.os.SystemClock; +import com.mogo.cloud.GsonUtil; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener; import com.mogo.cloud.socket.MsgBody; import com.mogo.cloud.socket.SocketManager; import com.mogo.cloud.socket.WebSocketData; +import com.mogo.cloud.utils.logger.Logger; import com.mogo.realtime.core.SimpleLocationCorrectStrategy; import com.mogo.realtime.entity.ADASRecognizedResult; import com.mogo.realtime.entity.CloudLocationInfo; @@ -16,8 +18,6 @@ import com.mogo.realtime.entity.MogoSnapshotSetData; import com.mogo.realtime.entity.OnePerSecondSendContent; import com.mogo.realtime.spi.RealTimeProviderImp; import com.mogo.realtime.util.MortonCode; -import com.mogo.cloud.GsonUtil; -import com.mogo.cloud.utils.logger.Logger; import com.zhidao.ptech.connsvr.protocol.MogoConnsvr; import java.util.ArrayList; @@ -94,8 +94,7 @@ public class SocketHandler { } @Override - public void onMsgReceived(WebSocketData webSocketData) { - int msgType = webSocketData.getMsgType(); + public void onMsgReceived(int msgType, WebSocketData webSocketData) { if (msgType == MSG_TYPE_ACK.getMsgType()) { if (webSocketData.getUtcTime() > 0) { serverTime = webSocketData.getUtcTime();