From 0fb7bd3bf5776abfea4b10feda177e8a25d78577 Mon Sep 17 00:00:00 2001 From: xuqm Date: Wed, 31 May 2023 10:45:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=96=87=E6=9C=AC=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bjca/trust/android/lib/im/enums/PacketType.java | 2 -- .../trust/android/lib/im/im/manager/ImManager.java | 6 +++--- .../trust/android/lib/im/im/manager/UserManager.java | 12 ++++++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/enums/PacketType.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/enums/PacketType.java index 2888fd9..0f0a928 100644 --- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/enums/PacketType.java +++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/enums/PacketType.java @@ -7,8 +7,6 @@ public enum PacketType { //发送消息 SEND(20), SEND_ACK(21), - ARRIVE(30), - ARRIVE_ACK(31), //心跳包 PING(40), PANG(41), diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/manager/ImManager.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/manager/ImManager.java index 773a4f8..67abd53 100644 --- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/manager/ImManager.java +++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/manager/ImManager.java @@ -96,7 +96,7 @@ public class ImManager implements IMInterface { private void initTopic() { topic_send_ack = Constant.getSdkAppID() + "/" + PacketType.SEND_ACK + Constant.getUserId(); topic_connected = Constant.getSdkAppID() + "/" + PacketType.CONNECTED + Constant.getUserId(); - topic_arrive = Constant.getSdkAppID() + "/" + PacketType.ARRIVE + Constant.getUserId(); + topic_arrive = Constant.getSdkAppID() + "/" + PacketType.SEND + Constant.getUserId(); topic_pang = Constant.getSdkAppID() + "/" + PacketType.PANG + Constant.getUserId(); topic_result = Constant.getSdkAppID() + "/" + PacketType.RESULT + Constant.getUserId(); topic_system = Constant.getSdkAppID() + "/" + PacketType.SYSTEM + Constant.getUserId(); @@ -244,7 +244,7 @@ public class ImManager implements IMInterface { szyxMessage.setDescribe(describe); szyxMessage.setGroup(isGroup); szyxMessage.setStatus(1); - szyxMessage.setFromClient(UserManager.getInstance().getUserInfo()); + szyxMessage.setFromClient(UserManager.getInstance().getUserInfoForMsg()); if (isGroup) szyxMessage.setGroupID(toUserId); else @@ -272,7 +272,7 @@ public class ImManager implements IMInterface { private void sendAckMsg(String msgId) { SendAckMessage message = new SendAckMessage(); - message.setMsgId(msgId); + message.setAckId(msgId); sendPacketMessage(PacketType.SEND_ACK, message, null); } diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/manager/UserManager.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/manager/UserManager.java index 9fb4f14..8ff4474 100644 --- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/manager/UserManager.java +++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/manager/UserManager.java @@ -16,15 +16,23 @@ public class UserManager { } private UserInfo userInfo; + private UserInfo userInfoForMsg; public UserInfo getUserInfo() { return userInfo; } - public UserInfo getUserInfoForMessage() { - return userInfo; + public UserInfo getUserInfoForMsg() { + return userInfoForMsg; } public void setUserInfo(UserInfo userInfo) { this.userInfo = userInfo; + UserInfo u = new UserInfo(); + u.setUserId(userInfo.getUserId()); + u.setGender(userInfo.getGender()); + u.setNickName(userInfo.getNickName()); + u.setFaceUrl(userInfo.getFaceUrl()); + u.setOsType(userInfo.getOsType()); + this.userInfoForMsg = u; } }