From 0c817607d8e8f9dc3c344ab547cdb973f76a9a2c Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 17 Feb 2022 17:46:24 +0800
Subject: [PATCH 1/4] CALL-test

---
 pages/im/private/call.nvue | 27 ++++++++++++---------------
 utils/im/index.js          |  4 +++-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pages/im/private/call.nvue b/pages/im/private/call.nvue
index f4be96d..e92287c 100644
--- a/pages/im/private/call.nvue
+++ b/pages/im/private/call.nvue
@@ -10,8 +10,7 @@
 
         <view class="status" v-if="!connected || mediaType == 0">
             <view class="remote">
-                <u-avatar :src="contact(targetId).portraitUrl" shape="square" size="96"
-                    bgColor="#fff" />
+                <u-avatar :src="contact(targetId).portraitUrl" shape="square" size="96" bgColor="#fff" />
                 <view><text class="nickname">{{ contact(targetId).name }}</text></view>
                 <view v-if="remoteRinging"><text class="mediaType">等待对方接听</text></view>
                 <view v-if="connected"><text class="mediaType">已接通</text></view>
@@ -68,10 +67,10 @@
         },
         onLoad(e) {
             this.targetId = e.targetId
-            this.mediaType = e.mediaType
-            // 进入页面开启外呼
-            CallLib.startSingleCall(this.targetId, this.mediaType, '');
-            
+            this.mediaType = e.mediaType
+            // 进入页面开启外呼
+            CallLib.startSingleCall(this.targetId, this.mediaType, '');
+            // 响铃
             this.startRing()
             // 监听通话链接状态
             uni.$once('onCallConnected', this.onCallConnected)
@@ -92,11 +91,11 @@
             },
             windowHeight() {
                 return uni.getSystemInfoSync().windowHeight
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
+            },
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
+                }
             }
         },
         methods: {
@@ -120,10 +119,8 @@
                 if (this.mediaType == 1) {
                     const session = CallLib.getCurrentCallSession()
                     setTimeout(() => {
-                        CallLib.setVideoView(session.targetId, this.$refs.bigVideoView.ref, 0,
-                            false)
-                        CallLib.setVideoView(session.mine.userId, this.$refs.smallVideoView.ref, 0,
-                            true)
+                        CallLib.setVideoView(session.targetId, this.$refs.bigVideoView.ref, 0, false)
+                        CallLib.setVideoView(session.mine.userId, this.$refs.smallVideoView.ref, 0, true)
                     }, 200)
                 }
             },
diff --git a/utils/im/index.js b/utils/im/index.js
index d969209..320af90 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -18,7 +18,9 @@ const initIm = (KEY) => {
     // 初始化的时候 自动链接
     if (store.getters.getToken !== '') {
         getImToken().then(res => {
-            connect(res.token, res.userInfo, () => {})
+            connect(res.token, res.userInfo, (res) => {
+                console.log('IM.CONNECT', res);
+            })
         })
     }
 }

From 1e7e589bab15b2b1c9f198f7242d4b1f7a71d66d Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 18 Feb 2022 09:46:17 +0800
Subject: [PATCH 2/4] nvue-vue

---
 ...messagePreview.nvue => messagePreview.vue} |   0
 ...sentMessageBar.nvue => sentMessageBar.vue} |   0
 .../{sentPopups.nvue => sentPopups.vue}       |   0
 .../{sentText.nvue => sentText.vue}           |   0
 .../{sentVoice.nvue => sentVoice.vue}         |   0
 .../{showImage.nvue => showImage.vue}         |   0
 .../{showText.nvue => showText.vue}           |   0
 .../{showVoice.nvue => showVoice.vue}         |   0
 pages/im/group/{chat.nvue => chat.vue}        |   0
 pages/im/group/invite.vue                     | 124 +++++++++++++++++-
 pages/im/private/{chat.nvue => chat.vue}      |   0
 11 files changed, 120 insertions(+), 4 deletions(-)
 rename pages/im/components/{messagePreview.nvue => messagePreview.vue} (100%)
 rename pages/im/components/{sentMessageBar.nvue => sentMessageBar.vue} (100%)
 rename pages/im/components/{sentPopups.nvue => sentPopups.vue} (100%)
 rename pages/im/components/{sentText.nvue => sentText.vue} (100%)
 rename pages/im/components/{sentVoice.nvue => sentVoice.vue} (100%)
 rename pages/im/components/{showImage.nvue => showImage.vue} (100%)
 rename pages/im/components/{showText.nvue => showText.vue} (100%)
 rename pages/im/components/{showVoice.nvue => showVoice.vue} (100%)
 rename pages/im/group/{chat.nvue => chat.vue} (100%)
 rename pages/im/private/{chat.nvue => chat.vue} (100%)

diff --git a/pages/im/components/messagePreview.nvue b/pages/im/components/messagePreview.vue
similarity index 100%
rename from pages/im/components/messagePreview.nvue
rename to pages/im/components/messagePreview.vue
diff --git a/pages/im/components/sentMessageBar.nvue b/pages/im/components/sentMessageBar.vue
similarity index 100%
rename from pages/im/components/sentMessageBar.nvue
rename to pages/im/components/sentMessageBar.vue
diff --git a/pages/im/components/sentPopups.nvue b/pages/im/components/sentPopups.vue
similarity index 100%
rename from pages/im/components/sentPopups.nvue
rename to pages/im/components/sentPopups.vue
diff --git a/pages/im/components/sentText.nvue b/pages/im/components/sentText.vue
similarity index 100%
rename from pages/im/components/sentText.nvue
rename to pages/im/components/sentText.vue
diff --git a/pages/im/components/sentVoice.nvue b/pages/im/components/sentVoice.vue
similarity index 100%
rename from pages/im/components/sentVoice.nvue
rename to pages/im/components/sentVoice.vue
diff --git a/pages/im/components/showImage.nvue b/pages/im/components/showImage.vue
similarity index 100%
rename from pages/im/components/showImage.nvue
rename to pages/im/components/showImage.vue
diff --git a/pages/im/components/showText.nvue b/pages/im/components/showText.vue
similarity index 100%
rename from pages/im/components/showText.nvue
rename to pages/im/components/showText.vue
diff --git a/pages/im/components/showVoice.nvue b/pages/im/components/showVoice.vue
similarity index 100%
rename from pages/im/components/showVoice.nvue
rename to pages/im/components/showVoice.vue
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.vue
similarity index 100%
rename from pages/im/group/chat.nvue
rename to pages/im/group/chat.vue
diff --git a/pages/im/group/invite.vue b/pages/im/group/invite.vue
index fa5fb59..91649aa 100644
--- a/pages/im/group/invite.vue
+++ b/pages/im/group/invite.vue
@@ -1,21 +1,137 @@
 <template>
-    <view class="">
-
+    <view>
+        <button type="default" @click="onInvite">确定</button>
+        <u-index-list :index-list="indexs" inactiveColor="#666" activeColor="#34CE98">
+            <u-checkbox-group v-if="friends.length > 0" v-model="checkboxValue" placement="column">
+                <u-index-item v-for="(item, fkey) in friends" :key="fkey">
+                    <u-index-anchor :text="indexs[fkey]" bgColor="#ededed" height="20" size="12" color="#666"
+                        style="padding:10rpx 30rpx" />
+                    <view v-for="(friendItem, index) in item" :key="index" class="friend-flex"
+                        @click="addContact(friendItem.targetId)">
+                        <u-checkbox :name="friendItem.targetId" shape="circle" />
+                        <u-avatar class="avatar-img" size="40" shape="square"
+                            :src="contact(friendItem.targetId).portraitUrl" />
+                        <view class="info">
+                            <view class="name">{{ contact(friendItem.targetId).name }}</view>
+                            <!-- <view class="address">Hash:{{ friendItem.address }}</view> -->
+                        </view>
+                    </view>
+                </u-index-item>
+            </u-checkbox-group>
+        </u-index-list>
     </view>
 </template>
 
 <script>
+    import {
+        getFriendsLetter,
+        inviteGroupUser
+    } from '@/apis/interfaces/im';
+    import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
+
     export default {
         data() {
             return {
-                targetId: ''
+                targetId: '',
+                indexs: [],
+                friends: [],
+                checkboxValue: []
+            };
+        },
+        computed: {
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
+                }
             }
         },
         onLoad(e) {
             this.targetId = e.targetId
+            this.getFriendList()
+        },
+        methods: {
+            getFriendList() {
+                getFriendsLetter().then(res => {
+                    this.indexs = res.indexList
+                    this.friends = res.itemArr
+                })
+            },
+            addContact(targetId) {
+                if (!this.checkboxValue.find(item => item == targetId)) {
+                    this.checkboxValue.push(targetId)
+                } else {
+                    const index = this.checkboxValue.findIndex(item => item == targetId)
+                    this.checkboxValue = this.checkboxValue.splice(index, 1)
+                }
+            },
+            onInvite() {
+                inviteGroupUser(this.targetId, this.checkboxValue).then(res => {
+                    uni.navigateBack()
+                }).catch(err => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err.message
+                    })
+                })
+            }
         }
     }
 </script>
 
-<style>
+<style lang="scss" scoped>
+    // 页面空
+    .pages-null {
+        height: 70vh;
+    }
+
+    // 好友列表
+    .friend-flex {
+        position: relative;
+        padding: 0 $padding 0 $padding;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        box-sizing: border-box;
+
+        .avatar-img {
+            box-shadow: 0 0 20rpx rgba($color: $main-color, $alpha: 0.2);
+        }
+
+        .info {
+            flex: 1;
+            margin-left: $padding;
+            border-bottom: solid 1rpx #f9f9f9;
+            height: 120rpx;
+            line-height: 120rpx;
+
+            .name {
+                font-size: $title-size;
+                color: #454545 !important;
+                @extend .nowrap;
+            }
+
+            .address {
+                color: $text-gray-m;
+                font-size: $title-size-m - 3;
+                padding-top: 10rpx;
+                word-break: break-word;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                width: 600rpx;
+            }
+        }
+    }
+
+    .list-cell {
+        display: flex;
+        box-sizing: border-box;
+        width: 100%;
+        padding: 10px 24rpx;
+        overflow: hidden;
+        color: #323233;
+        font-size: 14px;
+        line-height: 24px;
+        background-color: #fff;
+    }
 </style>
diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.vue
similarity index 100%
rename from pages/im/private/chat.nvue
rename to pages/im/private/chat.vue

From 08971f256dc5cd2e51832d61f4a02066f71a9745 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 18 Feb 2022 09:58:15 +0800
Subject: [PATCH 3/4] =?UTF-8?q?chat=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/group/chat.vue   | 21 ++++++++++++++-------
 pages/im/index.vue        |  2 +-
 pages/im/private/chat.vue | 10 ++++++----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index c62d24e..3126049 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -2,13 +2,18 @@
     <view class="group--chat">
         <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.message }}</text> </view>
+                <view class="cell-system" v-if="item.senderUserId === '__system__'"> <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" :src="contact(item.senderUserId).portraitUrl" />
+                    <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
+                        :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
-                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
-                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
-                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1"
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
                     </view>
                 </view>
             </cell>
@@ -163,11 +168,13 @@
 <style lang="scss" scoped>
     .group--chat {
         background: $window-color;
-        flex: 1;
+        height: 100vh;
+        display: flex;
+        flex-direction: column;
 
         .body {
-
             flex: 1;
+
             .cell {
                 padding: 10rpx 30rpx;
 
diff --git a/pages/im/index.vue b/pages/im/index.vue
index b4b715d..0555e65 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -99,7 +99,7 @@
                     code,
                     conversations
                 }) => {
-                    if (code === 0) {
+                    if (code === 0) {
                         this.conversations = conversations
                     }
                 })
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index ea795d3..a049abb 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -15,7 +15,8 @@
                         <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
                             :msg="item.content" />
                         <view class="state" v-if="item.messageDirection == 1">
-                            <text :class="item.sentStatus === 50?'state-text':'state-text-active'">{{ item.sentStatus == 50 ? '已读': '未读'}}</text>
+                            <text
+                                :class="item.sentStatus === 50?'state-text':'state-text-active'">{{ item.sentStatus == 50 ? '已读': '未读'}}</text>
                         </view>
                     </view>
                 </view>
@@ -169,8 +170,9 @@
     /* 窗口 */
     .chat {
         background: $window-color;
-        flex: 1;
-
+        height: 100vh;
+        display: flex;
+        flex-direction: column;
 
         .body {
             flex: 1;
@@ -223,7 +225,7 @@
 
                             .state-text-active {
                                 font-size: $title-size-m - 2;
-                               color: #cecece;
+                                color: #cecece;
                             }
                         }
                     }

From 6c0feb9cb60e7c756df3bbe34e36fbe467b90d27 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 18 Feb 2022 10:16:13 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/group/chat.vue   | 29 +++++++++++++----------------
 pages/im/private/chat.vue | 35 ++++++++++++++---------------------
 2 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index 3126049..73ef8b0 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -1,9 +1,8 @@
 <template>
     <view class="group--chat">
-        <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.message }}</text> </view>
+        <scroll-view class="body" :show-scrollbar="false">
+            <view class="cell" v-for="(item, index) in messages" :key="index">
+                <view class="cell-system" v-if="item.senderUserId === '__system__'">{{ item.content.message }}</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" />
@@ -16,9 +15,9 @@
                             :msg="item.content" :name="contact(item.senderUserId).name" />
                     </view>
                 </view>
-            </cell>
-            <cell class="cell-footer" ref="chatBottom" />
-        </list>
+            </view>
+            <view class="cell-footer" ref="chatBottom"></view>
+        </scroll-view>
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
     </view>
 </template>
@@ -168,26 +167,24 @@
 <style lang="scss" scoped>
     .group--chat {
         background: $window-color;
-        height: 100vh;
-        display: flex;
+        height: 100vh;
+        display: flex;
         flex-direction: column;
 
-        .body {
+        .body {
+            overflow: scroll;
             flex: 1;
 
             .cell {
                 padding: 10rpx 30rpx;
 
                 .cell-system {
-                    align-items: center;
-
-                    .text {
-                        font-size: 24rpx;
-                        color: $text-gray-m;
-                    }
+                    text-align: center;
                 }
 
                 .cell-item {
+                    display: flex;
+                    flex-direction: row;
                     width: 690rpx;
                     justify-content: flex-start;
                     align-items: flex-start;
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index a049abb..1175f79 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -1,9 +1,9 @@
 <template>
     <view class="chat">
         <!-- chat -->
-        <list class="body" :show-scrollbar="false">
-            <cell class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="time"> <text class="text">{{ customCN(item.sentTime) }}</text> </view>
+        <scroll-view class="body" scroll-y>
+            <view class="cell" v-for="(item, index) in messages" :key="index">
+                <view class="time">{{ customCN(item.sentTime) }}</view>
                 <view :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" size="40" shape="square" @click="showUser(targetId, item.messageDirection)"
                         :src="contact(item.senderUserId).portraitUrl" />
@@ -20,9 +20,9 @@
                         </view>
                     </view>
                 </view>
-            </cell>
-            <cell class="cell-footer" ref="chatBottom" />
-        </list>
+            </view>
+            <view class="cell-footer" ref="chatBottom"></view>
+        </scroll-view>
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
     </view>
 </template>
@@ -79,7 +79,7 @@
             this.targetId = e.targetId
             this.userInfo = this.$store.getters.contactInfo(this.targetId)
             uni.setNavigationBarTitle({
-                title: this.userInfo.name
+                title: this.contact(this.targetId).name
             })
             // 获取消息列表
             this.getMessageList()
@@ -170,32 +170,25 @@
     /* 窗口 */
     .chat {
         background: $window-color;
-        height: 100vh;
-        display: flex;
+        height: 100vh;
+        display: flex;
         flex-direction: column;
 
         .body {
             flex: 1;
+            overflow: scroll;
 
             .cell {
                 padding: 10rpx 30rpx;
 
                 .time {
-                    justify-content: center;
-                    align-items: center;
-                    padding-bottom: 20rpx;
-
-                    .text {
-                        background: #fff;
-                        font-size: 24rpx;
-                        color: #666;
-                        line-height: 40rpx;
-                        padding: 0 20rpx;
-                        border-radius: 10rpx;
-                    }
+                    text-align: center;
+                    font-size: 24rpx;
+                    color: #666;
                 }
 
                 .cell-item {
+                    display: flex;
                     width: 690rpx;
                     justify-content: flex-start;