From 3bfbd833e54306890c3d05a0cfaa97f5a2676911 Mon Sep 17 00:00:00 2001 From: xuqm Date: Fri, 2 Jun 2023 18:12:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E4=BC=9A=E8=AF=9D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trust/android/lib/im/bean/GroupInfo.java | 44 ++++++++++ .../android/lib/im/im/bean/PacketMessage.java | 13 +++ .../android/lib/im/im/manager/ImManager.java | 4 +- .../lib/im/im/msg/ConversationMessage.java | 87 +++++++++++++++++++ 4 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/bean/GroupInfo.java create mode 100644 SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/msg/ConversationMessage.java diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/bean/GroupInfo.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/bean/GroupInfo.java new file mode 100644 index 0000000..a70c282 --- /dev/null +++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/bean/GroupInfo.java @@ -0,0 +1,44 @@ +package cn.org.bjca.trust.android.lib.im.bean; + +public class GroupInfo { + private String adminId; + + private String groupId; + private String groupName; + private String faceUrl; + + public GroupInfo() { + } + + public String getAdminId() { + return adminId; + } + + public void setAdminId(String adminId) { + this.adminId = adminId; + } + + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public String getFaceUrl() { + return faceUrl; + } + + public void setFaceUrl(String faceUrl) { + this.faceUrl = faceUrl; + } +} diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/bean/PacketMessage.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/bean/PacketMessage.java index 308bb8c..68fdec7 100644 --- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/bean/PacketMessage.java +++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/bean/PacketMessage.java @@ -82,4 +82,17 @@ public abstract class PacketMessage { public void setUserName(String userName) { this.userName = userName; } + + @Override + public String toString() { + return "PacketMessage{" + + "msgId='" + msgId + '\'' + + ", packetType=" + packetType + + ", timestamp=" + timestamp + + ", appId='" + appId + '\'' + + ", userName='" + userName + '\'' + + ", token='" + token + '\'' + + ", osType='" + osType + '\'' + + '}'; + } } 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 bab394f..18a6910 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 @@ -31,6 +31,7 @@ import cn.org.bjca.trust.android.lib.im.im.bean.PacketMessage; import cn.org.bjca.trust.android.lib.im.im.kit.RequestImCallback; import cn.org.bjca.trust.android.lib.im.im.msg.ConnectMessage; import cn.org.bjca.trust.android.lib.im.im.msg.ConnectedMessage; +import cn.org.bjca.trust.android.lib.im.im.msg.ConversationMessage; import cn.org.bjca.trust.android.lib.im.im.msg.RequestMessage; import cn.org.bjca.trust.android.lib.im.im.msg.ResultMessage; import cn.org.bjca.trust.android.lib.im.im.msg.SendAckMessage; @@ -189,7 +190,8 @@ public class ImManager implements IMInterface { } // 会话更新 else if (topic.equals(topic_conversation)) { - Log.d("======>会话列表更新", topic + "::\n" + msg); + ConversationMessage cm = GsonImplHelp.get().toObject(msg, ConversationMessage.class); + Log.d("======>会话列表更新", topic + "::\n" + cm); } // 新消息送达 else if (topic.equals(topic_arrive)) { diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/msg/ConversationMessage.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/msg/ConversationMessage.java new file mode 100644 index 0000000..deffc4e --- /dev/null +++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/msg/ConversationMessage.java @@ -0,0 +1,87 @@ +package cn.org.bjca.trust.android.lib.im.im.msg; + + +import cn.org.bjca.trust.android.lib.im.bean.GroupInfo; +import cn.org.bjca.trust.android.lib.im.bean.UserInfo; +import cn.org.bjca.trust.android.lib.im.enums.PacketType; +import cn.org.bjca.trust.android.lib.im.im.bean.PacketMessage; +import cn.org.bjca.trust.android.lib.im.im.msg.message.SZYXMessage; + +public class ConversationMessage extends PacketMessage { + public ConversationMessage() { + super(PacketType.CONVERSATION); + } + + private boolean isSender; + private boolean isGroup; + + private SZYXMessage message; + + private GroupInfo groupEntity; + private UserInfo userInfo; + private UserInfo self; + + public ConversationMessage(PacketType packetType) { + super(packetType); + } + + public boolean isSender() { + return isSender; + } + + public void setSender(boolean sender) { + isSender = sender; + } + + public boolean isGroup() { + return isGroup; + } + + public void setGroup(boolean group) { + isGroup = group; + } + + public SZYXMessage getMessage() { + return message; + } + + public void setMessage(SZYXMessage message) { + this.message = message; + } + + public GroupInfo getGroupEntity() { + return groupEntity; + } + + public void setGroupEntity(GroupInfo groupEntity) { + this.groupEntity = groupEntity; + } + + public UserInfo getUserInfo() { + return userInfo; + } + + public void setUserInfo(UserInfo userInfo) { + this.userInfo = userInfo; + } + + public UserInfo getSelf() { + return self; + } + + public void setSelf(UserInfo self) { + this.self = self; + } + + @Override + public String toString() { + return "ConversationMessage{" + + "isSender=" + isSender + + ", isGroup=" + isGroup + + ", message=" + message + + ", groupEntity=" + groupEntity + + ", userInfo=" + userInfo + + ", self=" + self + + '}'; + } +}