TmOct5/ZhHealth
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

同步

Browse Source
This commit is contained in:
张冬雪
2022-02-23 16:31:14 +08:00
parent 8bb646a520 20317cc1df
commit f68e5fa1fd
7 changed files with 84 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pages/im/components/groupUserList.vue
View File

@@ -62,10 +62,9 @@
actionMap: [],
actionTitle: '',
currentUser: {},
avatarSize: 45,
avatarSize: 40,
labelSize: 14,
iconSize: 14
}
},
computed: {
@@ -76,7 +75,7 @@
}
},
created() {
this.avatarSize = utils.rpx2px(90)
this.avatarSize = utils.rpx2px(84)
this.labelSize = utils.rpx2px(24)
this.iconSize = utils.rpx2px(26)
},
@@ -277,7 +276,6 @@
border-radius: 0 8rpx 0 0;
position: relative;
width: 84rpx;
height: 84rpx;
overflow: hidden;
.admin {

24
pages/im/components/showMessageCell.vue
View File

@@ -1,6 +1,10 @@
<template>
<view class="">
<view class="notify" v-if="message.objectName === 'RC:GrpNtf'">{{ message.content.message }}</view>
<view class="notify" v-if="message.objectName === 'RC:GrpNtf'">
{{ message.content.message }}
<text class="link" @click="toAnnounce(message.content.extra)"
v-if="message.content.operation == 'ANNOUNCEMENT'">点击查看 </text>
</view>
<view class="notify" v-else-if="message.objectName === 'RC:RcNtf'">
{{ contact(message.senderUserId).name }} 撤回了一条消息
</view>
@@ -75,6 +79,19 @@
})
}
},
// 跳转群公告
toAnnounce(targetId) {
if (targetId) {
uni.navigateTo({
url: '/pages/im/group/announceCreate?targetId=' + this.targetId
})
} else {
uni.showToast({
icon: 'none',
title: '旧版本，无链接'
})
}
},
// 撤回消息测试
backMessage() {
if (this.$store.getters.sender.userId != this.message.senderUserId) {
@@ -118,6 +135,11 @@
text-align: center;
font-size: 24rpx;
color: #666;
.link {
color: blue;
margin-left: 10rpx;
}
}
.cell-item {

4
pages/im/group/announceCreate.vue
View File

@@ -1,11 +1,11 @@
<template>
<view class="create">
<view class="create-title">公告内容</view>
<block v-if="type !== 'cheack'">
<block v-if="type !== 'check'">
<u--textarea v-model="content" count height="240" maxlength="240" placeholder="请输入公告内容" />
<u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98" />
</block>
<block v-if="type === 'cheack'">
<block v-if="type === 'check'">
<view class="content-a"> {{content}} </view>
</block>
</view>

4
pages/im/group/announcement.vue
View File

@@ -76,7 +76,7 @@
onNavigationBarButtonTap() {
if (this.isAdmin) {
uni.navigateTo({
url: '/pages/im/group/announceCreate?targetId=' + this.targetId
url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId
})
} else {
uni.showToast({
@@ -119,7 +119,7 @@
},
tabA(id) {
uni.navigateTo({
url: '/pages/im/group/announceCreate?type=cheack&targetId=' + this.targetId + '&aId=' + id
url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId + '&aId=' + id
})
},
onTop(aId) {

16
pages/im/group/chat.vue
View File

@@ -55,12 +55,7 @@
},
onLoad(e) {
this.targetId = e.targetId
// 获取群成员数量
getGroupBase(this.targetId).then(res => {
uni.setNavigationBarTitle({
title: res.name + `(${res.members})`
})
})
this.initGroupInfo()
// 获取历史消息列表
this.getMessageList()
// 监听新消息
@@ -104,6 +99,7 @@
},
onUnload() {
uni.$off('onReceiveMessage_' + this.targetId)
uni.$off('onUpdateProfile_' + this.targetId)
uni.$off('onRecallMessage')
uni.$off('onReceiptRequest')
uni.$off('onReceiptResponse')
@@ -114,6 +110,14 @@
})
},
methods: {
initGroupInfo() {
// 获取群信息，成员数量，设置标题
getGroupBase(this.targetId).then(res => {
uni.setNavigationBarTitle({
title: res.name + `(${res.members})`
})
})
},
onScroll(e) {
this.$refs.messageBar.onHidePopus()
},

19
utils/im/listeners.js
View File

@@ -30,6 +30,7 @@ const onReceiveMessage = (message) => {
const checkContactExists = (message) => {
if (!store.getters.contactIsExist(message.targetId)) {
getUserInfo(message.targetId).then(res => {
console.log('targetId', res);
store.dispatch('initContact', res)
}).catch(err => {
console.error('getUserInfo ERR', err)
@@ -37,6 +38,7 @@ const checkContactExists = (message) => {
}
if (!store.getters.contactIsExist(message.senderUserId)) {
getUserInfo(message.senderUserId).then(res => {
console.log('senderUserId', message.senderUserId, res);
store.dispatch('initContact', res)
}).catch(err => {
console.error('getUserInfo ERR', err)
@@ -53,7 +55,8 @@ const notifyMsgTypes = [
IMLib.ObjectName.Location,
IMLib.ObjectName.Voice,
IMLib.ObjectName.HQVoice,
IMLib.ObjectName.Sight
IMLib.ObjectName.Sight,
IMLib.ObjectName.GroupNotification
]
const imLibListeners = () => {
@@ -70,6 +73,7 @@ const imLibListeners = () => {
if (utils.inArray(message.objectName, notifyMsgTypes)) {
onReceiveMessage(message)
} else if (message.objectName === IMLib.ObjectName.ProfileNotification) {
uni.$emit('onUpdateProfile_' + message.targetId)
// 更新联系人信息
store.dispatch('updateContact', JSON.parse(message.content.data))
// 调用完更新之后，删除这条消息
@@ -89,6 +93,19 @@ const imLibListeners = () => {
// 发布群解散的消息
uni.$emit('onGroupDismiss')
uni.$emit('onGroupDismiss_' + message.targetId)
} else if (message.content.operation === 'REMOVE') {
// 要判断是否当前用户，然后把当前用户踢出到主页去， 删除聊天记录，会话列表
if (message.content.extra == store.getters.sender.userId) {
IMLib.cleanHistoryMessages(message.conversationType, message.targetId, message.sentTime,
false)
// 解散了就删了吧
IMLib.removeConversation(message.conversationType, message.targetId)
// 为了更新群列表
uni.$emit('onGroupDismiss')
uni.$emit('onGroupRemoveYou_' + message.targetId)
}
uni.$emit('onReceiveMessage_' + message.targetId, message)
// 这个是为了更新消息列表页的
}
// 触发刷新会话列表
uni.$emit('onReceiveMessage', message)

20
utils/im/onGroupDismiss.js
View File

@@ -1,6 +1,13 @@
// 监听群解散的消息，直接跳转到会话列表页面
const onGroupDismiss = {
data() {
return {
currentTargetId: ''
}
},
onLoad(e) {
this.currentTargetId = e.targetId
uni.$once('onGroupDismiss_' + e.targetId, () => {
uni.showToast({
icon: 'none',
@@ -10,6 +17,19 @@ const onGroupDismiss = {
url: '/pages/im/index'
})
})
uni.$once('onGroupRemoveYou_' + e.targetId, () => {
uni.showToast({
icon: 'none',
title: '您已被移出群聊'
})
uni.switchTab({
url: '/pages/im/index'
})
})
},
onUnload() {
uni.$off('onGroupDismiss_' + this.currentTargetId)
uni.$off('onGroupRemoveYou_' + this.currentTargetId)
}
}