merge

pages/auth/auth.vue

@@ -39,6 +39,11 @@
         smsAuth
     } from "@/apis/interfaces/auth";
     import userAuth from "@/public/userAuth";
+    import {
+        getImToken
+    } from '@/apis/interfaces/im.js'
+    import im from '@/utils/im/index.js'
+
     export default {
         data() {
             return {
@@ -59,6 +64,11 @@
                         "setToken",
                         res.token_type + " " + res.access_token
                     );
+                    // 在这里，登录成功，链接IM服务
+                    getImToken().then(res => {
+                        console.log('在这获取IM-TOKEN', res);
+                        im.connect(res.token, res.userInfo, () => {})
+                    })
                     this.$Router.back();
                 }).catch((err) => {
                     uni.showToast({

pages/im/group/chat.nvue

@@ -3,7 +3,8 @@
         <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'">
-                    <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square" :src="item.content.userInfo.portraitUrl" />
+                    <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
+                        :src="item.content.userInfo.portraitUrl" />
                     <view class="msg">
                         <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
                             :msg="item.content" :name="item.content.userInfo.name" />
@@ -43,13 +44,18 @@
         data() {
             return {
                 targetId: '',
-                conversationType: 3,
+                conversationType: RongIMLib.ConversationType.GROUP,
                 messages: [],
                 groupInfo: {
                     name: ''
                 }
             }
         },
+        computed: {
+            latestMessage() {
+                return this.messages[this.messages.length - 1]
+            }
+        },
         onLoad(e) {
             this.targetId = e.targetId
             this.groupInfo = this.$store.getters.contactInfo(this.targetId)
@@ -64,10 +70,6 @@
             })
             uni.$once('cleanGroupMessage', this.getMessageList)
         },
-        onBackPress() {
-            uni.$off('onReceiveMessage')
-            console.log('Off onReceiveMessage');
-        },
         onNavigationBarButtonTap() {
             uni.navigateTo({
                 url: '/pages/im/group/info?targetId=' + this.targetId
@@ -82,18 +84,18 @@
                     uni.navigateTo({
                         url: '/pages/im/friends/mine?targetId=' + item.senderUserId
                     })
-                } else{
+                } else {
-                   uni.navigateTo({
+                    uni.navigateTo({
-                       url: '/pages/im/friends/info?targetId=' + item.senderUserId
+                        url: '/pages/im/friends/info?targetId=' + item.senderUserId
-                   }) 
+                    })
                 }
             },
             getNewMessage() {
                 im.getMessageList(
                     this.conversationType,
                     this.targetId,
-                    new Date().getTime(),
+                    this.latestMessage.sentTime,
-                    10,
+                    1,
                     false,
                     (messages) => {
                         this.messages = this.messages.concat(messages)
@@ -105,7 +107,7 @@
                 im.getMessageList(
                     this.conversationType,
                     this.targetId,
-                    new Date().getTime(),
+                    0,
                     100,
                     true,
                     (messages) => {
@@ -115,12 +117,15 @@
             },
             // 滚动到底部
             scrollBottom(type) {
-                // 清理当前会话，未读消息数量
+                if (this.latestMessage) {
-                RongIMLib.clearMessagesUnreadStatus(this.conversationType, this.targetId, new Date().getTime() + 1100)
+                    // 清理当前会话，未读消息数量
-                // 发送消息已读状态给对方
+                    RongIMLib.clearMessagesUnreadStatus(this.conversationType, this.targetId, this.latestMessage
-                RongIMLib.sendReadReceiptMessage(this.conversationType, this.targetId, new Date().getTime())
+                        .sentTime)
-                // 更新badge提醒数量
+                    // // 发送消息已读状态给对方
-                im.setNotifyBadge()
+                    // RongIMLib.sendReadReceiptMessage(this.conversationType, this.targetId, this.latestMessage.sentTime)
+                    // 更新badge提醒数量
+                    im.setNotifyBadge()
+                }
 
                 setTimeout(() => {
                     let el = this.$refs.chatBottom

pages/im/private/chat.nvue

@@ -42,6 +42,12 @@
     const ChatList = uni.requireNativePlugin('dom')
 
     export default {
+        components: {
+            sentMessageBar,
+            showVoice,
+            showImage,
+            showText
+        },
         data() {
             return {
                 targetId: '',
@@ -54,11 +60,10 @@
                 }
             }
         },
-        components: {
+        computed: {
-            sentMessageBar,
+            latestMessage() {
-            showVoice,
+                return this.messages[this.messages.length - 1]
-            showImage,
+            }
-            showText
         },
         onLoad(e) {
             this.targetId = e.targetId
@@ -98,8 +103,8 @@
                 im.getMessageList(
                     this.conversationType,
                     this.targetId,
-                    new Date().getTime(),
+                    this.latestMessage.sentTime,
-                    10,
+                    1,
                     false,
                     (messages) => {
                         this.messages = this.messages.concat(messages)
@@ -111,7 +116,7 @@
                 im.getMessageList(
                     this.conversationType,
                     this.targetId,
-                    new Date().getTime(),
+                    0,
                     100,
                     true,
                     (messages) => {
@@ -128,12 +133,15 @@
             },
             // 滚动到底部
             scrollBottom(type) {
-                // 清理当前会话，未读消息数量
+                if (this.latestMessage) {
-                RongIMLib.clearMessagesUnreadStatus(this.conversationType, this.targetId, new Date().getTime())
+                    // 清理当前会话，未读消息数量
-                // 发送消息已读状态给对方
+                    RongIMLib.clearMessagesUnreadStatus(this.conversationType, this.targetId, this.latestMessage
-                RongIMLib.sendReadReceiptMessage(this.conversationType, this.targetId, new Date().getTime())
+                        .sentTime)
-                // 更新badge提醒数量
+                    // // 发送消息已读状态给对方
-                im.setNotifyBadge()
+                    RongIMLib.sendReadReceiptMessage(this.conversationType, this.targetId, this.latestMessage.sentTime)
+                    // 更新badge提醒数量
+                    im.setNotifyBadge()
+                }
                 setTimeout(() => {
                     let el = this.$refs.chatBottom
                     ChatList.scrollToElement(el, {

public/userAuth.js

@@ -105,9 +105,11 @@ class userAuth {
                         openid: authResult.authResult.openid
                     }).then(res => {
                         uni.closeAuthView()
-                        store.commit('setToken', res.token_type + ' ' + res.access_token)
+                        store.commit('setToken', res.token_type + ' ' + res
+                            .access_token)
                         // 在这里，登录成功，链接IM服务
                         getImToken().then(res => {
+                            console.log('在这获取IM-TOKEN', res);
                             im.connect(res.token, res.userInfo)
                         })
                         resolve()

utils/im/index.js

@@ -6,7 +6,8 @@ import listeners from './listeners.js'
 import {
     getFriends,
     getUserInfo,
-    getImToken
+    getImToken,
+    getMyGroups
 } from '@/apis/interfaces/im.js'
 
 const initIm = (KEY) => {
@@ -58,7 +59,7 @@ const connect = (token, userInfo, callback) => {
         // 设置未读消息数量
         setNotifyBadge()
         // 首次运行获取好友列表
-        const FK = 'IFT_' + userInfo.targetId
+        const FK = 'ZHK_' + userInfo.targetId
 
         uni.getStorage({
             key: FK,
@@ -71,10 +72,12 @@ const connect = (token, userInfo, callback) => {
                 })
             },
             fail: () => {
-                // 程序是首次运行，初始化加载好友信息
+                // 程序是首次运行，初始化加载好友和群组信息
-                getFriends().then(res => {
+                Promise.all([getFriends(), getMyGroups()]).then(result => {
-                    res.map(item => {
+                    result.map(contacts => {
-                        store.dispatch('initContact', item)
+                        contacts.map(item => {
+                            store.dispatch('initContact', item)
+                        })
                     })
                     uni.setStorageSync(FK, userInfo.targetId)
                 })