From 411b1ea349110dbb7e5a4c3c270b1ec3a02dc113 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 12:06:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E8=A7=A3=E6=95=A3=E7=9A=84=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E6=B6=88=E6=81=AF=E5=88=A0=E9=99=A4=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/messageCell.vue     | 16 +++++++---------
 pages/im/components/messagePreview.nvue |  3 +++
 pages/im/group/chat.nvue                |  5 +++--
 pages/im/group/info.vue                 |  1 +
 pages/im/index.vue                      | 20 ++++++++++++--------
 utils/im/index.js                       | 15 ++++++++++++++-
 utils/im/message.js                     |  3 ++-
 7 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index f5a373c..b3dc52e 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -6,10 +6,12 @@
         </view>
         <view class="content">
             <view class="header">
-                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3" class='qun'>[群]</text></view>
+                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3"
+                        class='qun'>[群]</text></view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
             </view>
-            <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType" :user="item.latestMessage.userInfo" />
+            <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType"
+                :user="item.latestMessage.userInfo" />
         </view>
     </view>
 </template>
@@ -17,10 +19,6 @@
 <script>
     import messagePreview from './messagePreview'
 
-
-
-
-
     export default {
         props: {
             item: {
@@ -72,9 +70,9 @@
 
                 .name {
                     font-size: $title-size + 2;
-                    color: #454545;
-                    display: flex;
-                    align-items: center;
+                    color: #454545;
+                    display: flex;
+                    align-items: center;
 
                     .qun {
                         color: $main-color;
diff --git a/pages/im/components/messagePreview.nvue b/pages/im/components/messagePreview.nvue
index cb44e6a..2e8814e 100644
--- a/pages/im/components/messagePreview.nvue
+++ b/pages/im/components/messagePreview.nvue
@@ -23,6 +23,9 @@
         </view>
         <view class="preview" v-if="msg.objectName=='RC:VideoMsg'">
             <text v-if="conversationType == 3">{{ user.name }}：</text>[视频通话]
+        </view>
+        <view class="preview" v-if="msg.objectName=='RC:GrpNtf'">
+            [{{ msg.message }}]
         </view>
     </view>
 </template>
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index 2c65ff1..ee6d940 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -3,7 +3,7 @@
         <list class="body" :show-scrollbar="false">
             <cell class="cell" v-for="(item, index) in messages" :key="index">
                 <view class="cell-system" v-if="item.senderUserId === '__system__'">
-                    <text class="text">{{ item.content.content }}</text>
+                    <text class="text">{{ item.content.message }}</text>
                 </view>
                 <view v-else :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
@@ -178,8 +178,9 @@
             .cell {
                 padding: 10rpx 30rpx;
 
-                .cell-system {
+                .cell-system {
                     align-items: center;
+
                     .text {
                         font-size: 24rpx;
                         color: $text-gray-m;
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index a6cced9..78432ad 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -273,6 +273,7 @@
                     success: (res) => {
                         if (res.confirm) {
                             dismissGroup(this.targetId).then(res => {
+                                console.log('解散群', res);
                                 uni.showToast({
                                     icon: 'none',
                                     title: '解散成功'
diff --git a/pages/im/index.vue b/pages/im/index.vue
index eb0df3c..47c6d00 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -53,10 +53,10 @@
         },
         onLoad() {
             // 好友申请数量
-            this.checkNewFriendPending()
-            // 监听新的好友申请
-            uni.$on('onContactNotification', () => {
-                this.checkNewFriendPending()
+            this.checkNewFriendPending()
+            // 监听新的好友申请
+            uni.$on('onContactNotification', () => {
+                this.checkNewFriendPending()
             })
         },
         onShow() {
@@ -76,7 +76,7 @@
         },
         methods: {
             checkNewFriendPending() {
-                im.getPendingList((pendings) => {
+                im.getPendingList((pendings) => {
                     console.log(pendings);
                     this.hasNewFriends = pendings.length
                 })
@@ -94,9 +94,13 @@
             getConversationList() {
                 const count = 1000
                 const timestamp = 0
-                RongIMLib.getConversationList([1, 3], count, timestamp, (res) => {
-                    if (res.code === 0) {
-                        this.conversations = res.conversations
+                RongIMLib.getConversationList([1, 3], count, timestamp, ({
+                    code,
+                    conversations
+                }) => {
+                    console.log(conversations);
+                    if (code === 0) {
+                        this.conversations = conversations
                     }
                 })
             },
diff --git a/utils/im/index.js b/utils/im/index.js
index 3f7d26c..5cd6fab 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -159,9 +159,22 @@ const addListeners = () => {
             }) => {
                 console.log('消息删除结果', code)
             })
-        } else if (message.objectName === RongIMLib.ObjectName.ContactNotification) {
+        } else if (message.objectName === RongIMLib.ObjectName.ContactNotification) {
             // 触发一个新好友的通知事件
             uni.$emit('onContactNotification', message)
+        } else if (message.objectName === RongIMLib.ObjectName.GroupNotification) {
+            // 解散群
+            if (message.content.operation === 'Dismiss') {
+                RongIMLib.cleanHistoryMessages(message.conversationType, message.targetId,
+                    message.sentTime - 1, false, ({
+                        code
+                    }) => {
+                        if (code == 0) {
+                            uni.$emit('onGroupDismiss', message.targetId)
+                        }
+                    })
+            }
+            uni.$emit('onReceiveMessage', message)
         }
     })
 
diff --git a/utils/im/message.js b/utils/im/message.js
index add384b..39f0352 100644
--- a/utils/im/message.js
+++ b/utils/im/message.js
@@ -15,7 +15,8 @@ const getMessageList = (conversationType, targetId, timeStamp, count, isForward,
         'RC:LBSMsg',
         'RC:SightMsg',
         'RC:ReferenceMsg',
-        'RC:CombineMsg'
+        'RC:CombineMsg',
+        'RC:GrpNtf'
     ]
 
     RongIMLib.getHistoryMessagesByTimestamp(