From dfc58676f96cbc6d1ac0f647f181d263fe83ff1e Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 16 Feb 2022 18:04:53 +0800
Subject: [PATCH 1/4] clean

---
 pages/im/index.vue | 2 --
 utils/im/index.js  | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pages/im/index.vue b/pages/im/index.vue
index 111ce88..eb0df3c 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -56,7 +56,6 @@
             this.checkNewFriendPending()
             // 监听新的好友申请
             uni.$on('onContactNotification', () => {
-                console.log('监听申请');
                 this.checkNewFriendPending()
             })
         },
@@ -77,7 +76,6 @@
         },
         methods: {
             checkNewFriendPending() {
-                console.log('触发新申请好友事件');
                 im.getPendingList((pendings) => {
                     console.log(pendings);
                     this.hasNewFriends = pendings.length
diff --git a/utils/im/index.js b/utils/im/index.js
index e508f78..3f7d26c 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -160,9 +160,8 @@ const addListeners = () => {
                 console.log('消息删除结果', code)
             })
         } else if (message.objectName === RongIMLib.ObjectName.ContactNotification) {
-            console.log('onContactNotification');
             // 触发一个新好友的通知事件
-            uni.$emit('onContactNotification', message.content)
+            uni.$emit('onContactNotification', message)
         }
     })
 

From 3a3517b5bee565c40e6ab9775a591ca89fe1fc87 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 09:37:05 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=BE=A4=E7=9A=84=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                             | Bin 12292 -> 14340 bytes
 pages/im/components/groupUserList.vue |  92 ++++++++++++++------------
 pages/im/group/chat.nvue              |  33 +++++++--
 pages/im/private/chat.nvue            |   4 +-
 4 files changed, 81 insertions(+), 48 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 0451fa5350573968a44737610eb8813fa8341acb..c1a2c05689ed421f0ce5b68a5d14a53025647039 100644
GIT binary patch
delta 210
zcmZokXem%&U|?W$DortDU@!nOIe-{M3-ADmHU<U-o{0+jq7gt2Gf<F$p_rjKC*3eO
zIX|~xVxjV6109yh+>C;gB?JT~>nezEekh^EKCwY^Gdl+h2cyPj4S~n}6B}eUb1R%<
z+WcQBpJlQD<HOCa632jwBqUjZrUHQhH;`~ewsNx|(|hL0{5ravj6kUaK+G`NhDVx*
f3F1Brut0{+M3&;*e3!|ds`8uNR5h4@X72$2PY5d?

delta 248
zcmZoEXh~3DU|?W$DortDV9)?EIe-{M3-ADifgA<yi3<9nkw6h<pdbT7F+*`ud2vBf
zPJYtFi;E{4n6OOj7MvWSes%Ik1+j%!*fz6suy8PHPMjdSnOEQu|7LE5b4*Ii3^@#$
z3`w3j`N<%SAmf3i%K~Y=|6std`KnSe%j6nyiOE^w4N?rOKq(;5;06+|$d1`~@jdfo
qeiL0CkTfF@H-H#G0Aw>kX%;9A@(M`YU~-Ph#LbsgN|~S*)BymjsWe9b

diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index 5a3cfcf..ad222ad 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -3,13 +3,16 @@
         <view class="users">
             <view :class="['user', {'active': item.targetId == currentUser.targetId}]" @longpress="showAction(item)"
                 v-for="(item, index) in users" :key="index" @click="toUser(item)">
-                <u-avatar :size="avatarSize" shape="square" :src="contact(item.targetId).portraitUrl"></u-avatar>
+                <view class="avatar">
+                    <u-avatar :size="avatarSize" shape="square" :src="contact(item.targetId).portraitUrl"></u-avatar>
+                    <view class="admin" v-if="item.is_admin">管理</view>
+                    <view class="owner" v-if="item.targetId === adminUid">群主</view>
+                </view>
                 <view class="name">{{ item.name }}</view>
-                <view class="admin" v-if="item.is_admin">管理</view>
-                <view class="owner" v-if="item.targetId === adminUid">群主</view>
             </view>
             <view class="user" v-if="isAdmin">
-                <u-avatar @click="inviteUser" shape="square" icon="plus" bg-color="#eeeeee" color="#999999">
+                <u-avatar @click="inviteUser" :size="avatarSize" shape="square" icon="plus" bg-color="#eeeeee"
+                    color="#999999">
                 </u-avatar>
                 <view class="name">邀请好友</view>
             </view>
@@ -58,17 +61,16 @@
                 currentUser: {},
                 avatarSize: 40
             }
-        },
-        computed: {
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            }
+        },
+        computed: {
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
+                }
+            }
         },
         created() {
-            this.avatarSize = 126 / 750 * wx.getSystemInfoSync().windowWidth
-            console.log(this.avatarSize)
+            this.avatarSize = 90 / 750 * wx.getSystemInfoSync().windowWidth
         },
         mounted() {
             this.initGroupInfo()
@@ -237,7 +239,6 @@
     }
 </script>
 
-
 <style lang="scss" scoped>
     .users {
         flex-direction: row;
@@ -246,8 +247,6 @@
         padding: 20rpx 0;
 
         .user {
-            overflow: hidden;
-            position: relative;
             width: 126rpx;
             margin-left: 20rpx;
             margin-bottom: 20rpx;
@@ -255,12 +254,46 @@
             flex-direction: column;
             justify-content: center;
             align-items: center;
-            border-radius: 0 10rpx 0 0;
 
             &.active {
                 background-color: $window-color;
             }
 
+            .avatar {
+                border-radius: 0 8rpx 0 0;
+                position: relative;
+                width: 90rpx;
+                height: 90rpx;
+                overflow: hidden;
+
+                .admin {
+                    position: absolute;
+                    background-color: $main-color;
+                    transform: rotate(45deg);
+                    color: #ffffff;
+                    font-size: 12rpx;
+                    width: 100rpx;
+                    padding-top: 30rpx;
+                    text-align: center;
+                    right: -45rpx;
+                    top: -20rpx;
+                }
+
+                .owner {
+                    position: absolute;
+                    background-color: $text-price;
+                    transform: rotate(45deg);
+                    color: #ffffff;
+                    font-size: 12rpx;
+                    width: 100rpx;
+                    padding-top: 30rpx;
+                    text-align: center;
+                    right: -45rpx;
+                    top: -20rpx;
+                }
+
+            }
+
             .name {
                 color: $text-gray-m;
                 width: 126rpx;
@@ -272,31 +305,6 @@
                 word-break: break-word;
             }
 
-            .admin {
-                position: absolute;
-                background-color: $main-color;
-                transform: rotate(45deg);
-                color: #ffffff;
-                font-size: 12rpx;
-                width: 100rpx;
-                padding-top: 30rpx;
-                text-align: center;
-                right: -45rpx;
-                top: -20rpx;
-            }
-
-            .owner {
-                position: absolute;
-                background-color: $text-price;
-                transform: rotate(45deg);
-                color: #ffffff;
-                font-size: 12rpx;
-                width: 100rpx;
-                padding-top: 30rpx;
-                text-align: center;
-                right: -45rpx;
-                top: -20rpx;
-            }
         }
     }
 
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index a6d6faa..2c65ff1 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -2,7 +2,10 @@
     <view class="group--chat">
         <list class="body" :show-scrollbar="false">
             <cell class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="cell-item" :class="item.messageDirection == 1 ? 'right' : 'left'">
+                <view class="cell-system" v-if="item.senderUserId === '__system__'">
+                    <text class="text">{{ item.content.content }}</text>
+                </view>
+                <view v-else :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
                         :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
@@ -25,6 +28,9 @@
     import {
         timeCustomCN
     } from '@/utils/filters.js'
+    import {
+        getGroupBase
+    } from '@/apis/interfaces/im.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import im from '@/utils/im/index.js'
     import showVoice from '../components/showVoice'
@@ -73,12 +79,21 @@
             uni.setNavigationBarTitle({
                 title: this.groupInfo.name
             })
+            // 获取群成员数量
+            getGroupBase(this.targetId).then(res => {
+                uni.setNavigationBarTitle({
+                    title: this.groupInfo.name + `(${res.members})`
+                })
+            })
+            // 获取历史消息列表
             this.getMessageList()
+            // 监听收到本群的消息，追加消息
             uni.$on('onReceiveMessage', (msg) => {
                 if (msg.targetId == this.targetId) {
                     this.getNewMessage()
                 }
             })
+            // 清理聊天记录
             uni.$once('cleanGroupMessage', this.getMessageList)
         },
         onNavigationBarButtonTap() {
@@ -87,6 +102,7 @@
             })
         },
         methods: {
+            // 转到好友资料页面
             toUser(item) {
                 if (item.senderUserId == '__system__') {
                     return
@@ -106,9 +122,9 @@
                     this.conversationType,
                     this.targetId,
                     this.latestMessage.sentTime,
-                    1,
+                    10,
                     false,
-                    (messages) => {
+                    (messages) => {
                         this.messages = this.messages.concat(messages)
                         this.scrollBottom()
                     })
@@ -122,7 +138,8 @@
                     100,
                     true,
                     (messages) => {
-                        this.messages = messages.reverse()
+                        console.log(messages);
+                        this.messages = messages.reverse()
                         this.scrollBottom()
                     })
             },
@@ -161,6 +178,14 @@
             .cell {
                 padding: 10rpx 30rpx;
 
+                .cell-system {
+                    align-items: center;
+                    .text {
+                        font-size: 24rpx;
+                        color: $text-gray-m;
+                    }
+                }
+
                 .cell-item {
                     width: 690rpx;
                     justify-content: flex-start;
diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.nvue
index bf07114..ddbb87a 100644
--- a/pages/im/private/chat.nvue
+++ b/pages/im/private/chat.nvue
@@ -5,8 +5,8 @@
             <cell class="cell" v-for="(item, index) in messages" :key="index">
                 <view class="time">
                     <text class="text">{{ customCN(item.sentTime) }}</text>
-                </view>
-                <view class="cell-item" :class="item.messageDirection == 1 ? 'right' : 'left'">
+                </view>
+                <view :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" size="36" shape="square" @click="showUser(targetId, item.messageDirection)"
                         :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">

From 155d59a6a34dc2710abfde63101e361ab7e0372e Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 11:22:02 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BE=A4=E7=BB=84?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/groupUserList.vue | 8 ++++++--
 pages/im/group/index.vue              | 7 ++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index ad222ad..20d07e2 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -74,7 +74,12 @@
         },
         mounted() {
             this.initGroupInfo()
-            this.initUsers()
+            getGroupUsers(this.targetId, this.count).then(res => {
+                this.users = res
+                res.map(item => {
+                    this.$store.dispatch('updateContact', item)
+                })
+            })
         },
         methods: {
             initGroupInfo() {
@@ -88,7 +93,6 @@
             initUsers() {
                 getGroupUsers(this.targetId, this.count).then(res => {
                     this.users = res
-                    console.log('群成员列表', res);
                 })
             },
             hideAction(item) {
diff --git a/pages/im/group/index.vue b/pages/im/group/index.vue
index caf00ab..97bbad8 100644
--- a/pages/im/group/index.vue
+++ b/pages/im/group/index.vue
@@ -63,13 +63,14 @@
                     uni.showToast({
                         title: '创建成功'
                     })
-                    this.initData()
-                    this.onHideModal()
                 }).catch(err => {
                     uni.showToast({
                         icon: 'none',
-                        title: err
+                        title: err.message
                     })
+                }).finally(() => {
+                    this.initData()
+                    this.onHideModal()
                 })
             },
             toGroup(targetId) {

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 4/4] =?UTF-8?q?=E7=BE=A4=E8=A7=A3=E6=95=A3=E7=9A=84?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=B6=88=E6=81=AF=E5=88=A0=E9=99=A4=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=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(