From a9d09d1a3f7ae39b84bd92d421d0dd3e7a5168d0 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 18 Feb 2021 10:55:48 +0800 Subject: [PATCH] extends sendMsg data --- .idea/gradle.xml | 1 + .../src/main/java/com/mogo/cloud/socket/SocketManager.java | 2 +- .../src/main/java/com/mogo/realtime/socket/SocketHandler.java | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) 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-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java index d718ebb..471aa55 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 @@ -120,7 +120,7 @@ public class SocketManager implements IMogoCloudSocketManager, Callback { @Override public void sendMsg(String appId, int headerType, MsgBody body, IMogoCloudSocketMsgAckListener listener) { Logger.d(TAG, "sendMsg msgId : " + body.getMsgId()); - final byte[] pb = convertToPBBytes(body.getMsgType(), objectToBytes(body.getContent())); + final byte[] pb = convertToPBBytes(body.getMsgType(), (byte[])body.getContent()); SocketClient.getInstance().sendData(appId, MogoCommon.Product.mogoBussiness.getNumber(), pb, headerType, true, body.getMsgId()); mAckListeners.put(body.getMsgId(), listener); } 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 2adf80b..2c9aa97 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 @@ -175,13 +175,15 @@ public class SocketHandler { webSocketData.setSeq(computeSendMsgTime()); webSocketData.setSn(MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn()); webSocketData.setData(GsonUtil.jsonFromObject(content)); + String msg = GsonUtil.jsonFromObject(webSocketData); + int msgType = LOW_FREQUENCY_CHANNEL_ID; if (cloudLocationInfo.size() > 2) { msgType = HIGH_FREQUENCY_CHANNEL_ID; } MsgBody msgBody = new MsgBody(); msgBody.msgType(msgType); - msgBody.content(webSocketData); + msgBody.content(msg); SocketManager.getInstance().sendMsg(mAppId, HEADER_TYPE, msgBody, msgId -> { for (IMogoCloudOnMsgListener listener : onMsgListenerList) { if (listener != null) {