From dc2b1a99135160b1c2965c70177db3aeb2ced454 Mon Sep 17 00:00:00 2001 From: SL Date: Mon, 23 Sep 2024 15:55:33 +0800 Subject: [PATCH] fix:update cmd message --- .idea/other.xml | 318 ------------------ wkim/build.gradle | 3 +- .../wukongim/manager/ConversationManager.java | 4 + .../xinbida/wukongim/manager/MsgManager.java | 4 + .../wukongim/message/MessageHandler.java | 5 +- 5 files changed, 12 insertions(+), 322 deletions(-) delete mode 100644 .idea/other.xml diff --git a/.idea/other.xml b/.idea/other.xml deleted file mode 100644 index 94c96f6..0000000 --- a/.idea/other.xml +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/wkim/build.gradle b/wkim/build.gradle index ce59a01..baa6463 100644 --- a/wkim/build.gradle +++ b/wkim/build.gradle @@ -34,8 +34,7 @@ android { buildTypes { release { - zipAlignEnabled true - minifyEnabled true + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/wkim/src/main/java/com/xinbida/wukongim/manager/ConversationManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/ConversationManager.java index f80248d..6c3d3e4 100644 --- a/wkim/src/main/java/com/xinbida/wukongim/manager/ConversationManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/manager/ConversationManager.java @@ -23,6 +23,7 @@ import com.xinbida.wukongim.interfaces.IRefreshConversationMsg; import com.xinbida.wukongim.interfaces.ISyncConversationChat; import com.xinbida.wukongim.interfaces.ISyncConversationChatBack; import com.xinbida.wukongim.message.type.WKConnectStatus; +import com.xinbida.wukongim.message.type.WKMsgContentType; import com.xinbida.wukongim.utils.WKCommonUtils; import com.xinbida.wukongim.utils.WKLoggerUtils; @@ -279,6 +280,9 @@ public class ConversationManager extends BaseManager { if (syncChat.conversations.get(i).recents != null && WKCommonUtils.isNotEmpty(syncChat.conversations)) { for (WKSyncRecent wkSyncRecent : syncChat.conversations.get(i).recents) { WKMsg msg = MsgManager.getInstance().WKSyncRecent2WKMsg(wkSyncRecent); + if (msg.type == WKMsgContentType.WK_INSIDE_MSG) { + continue; + } if (WKCommonUtils.isNotEmpty(msg.reactionList)) { msgReactionList.addAll(msg.reactionList); } diff --git a/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java index 55ed127..bb696bc 100644 --- a/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java @@ -42,6 +42,7 @@ import com.xinbida.wukongim.interfaces.IUploadAttachmentListener; import com.xinbida.wukongim.interfaces.IUploadMsgExtraListener; import com.xinbida.wukongim.message.MessageHandler; import com.xinbida.wukongim.message.WKConnection; +import com.xinbida.wukongim.message.type.WKMsgContentType; import com.xinbida.wukongim.message.type.WKSendMsgResult; import com.xinbida.wukongim.msgmodel.WKFormatErrorContent; import com.xinbida.wukongim.msgmodel.WKImageContent; @@ -951,6 +952,9 @@ public class MsgManager extends BaseManager { List msgIds = new ArrayList<>(); for (int j = 0, len = list.size(); j < len; j++) { WKMsg wkMsg = WKSyncRecent2WKMsg(list.get(j)); + if (wkMsg.type == WKMsgContentType.WK_INSIDE_MSG){ + continue; + } msgList.add(wkMsg); if (!TextUtils.isEmpty(wkMsg.messageID)) { msgIds.add(wkMsg.messageID); diff --git a/wkim/src/main/java/com/xinbida/wukongim/message/MessageHandler.java b/wkim/src/main/java/com/xinbida/wukongim/message/MessageHandler.java index 2f8cefe..003c128 100644 --- a/wkim/src/main/java/com/xinbida/wukongim/message/MessageHandler.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/MessageHandler.java @@ -6,7 +6,6 @@ import com.xinbida.wukongim.WKIM; import com.xinbida.wukongim.WKIMApplication; import com.xinbida.wukongim.db.ConversationDbManager; import com.xinbida.wukongim.db.MsgDbManager; -import com.xinbida.wukongim.db.WKDBColumns; import com.xinbida.wukongim.entity.WKChannelType; import com.xinbida.wukongim.entity.WKMsg; import com.xinbida.wukongim.entity.WKSyncMsg; @@ -229,7 +228,9 @@ public class MessageHandler { private void handleReceiveMsg(WKMsg message) { message = parsingMsg(message); - addReceivedMsg(message); + if (message.type != WKMsgContentType.WK_INSIDE_MSG) { + addReceivedMsg(message); + } } private synchronized void addReceivedMsg(WKMsg msg) {