Skip to content

Commit 3d70a5d

Browse files
committed
群会话里面,显示消息回执前需要判断是否开启了群消息回执
1 parent 68501f3 commit 3d70a5d

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

src/pstore.js

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export const pstore = defineStore('store-p', () => {
1717

1818
// TODO 调用setUserEnableReceipt时,需要更新
1919
isMessageReceiptEnable: false,
20+
isGroupMessageReceiptEnable: false,
2021

2122
inputtingUser: null,
2223
inputClearHandler: null,

src/store.js

+1
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ let store = {
503503
this._loadSelfUserInfo();
504504
this._loadUserLocalSettings();
505505
conversationState.isMessageReceiptEnable = wfc.isReceiptEnabled() && wfc.isUserReceiptEnabled();
506+
conversationState.isGroupMessageReceiptEnable = wfc.isGroupReceiptEnabled() && wfc.isUserReceiptEnabled();
506507
// if (conversationState.currentConversationInfo) {
507508
// this._loadCurrentConversationMessages();
508509
// }

src/ui/main/conversation/message/NormalOutMessageContentContainerView.vue

+8-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<div class="message-avatar-content-container">
1313
<!-- 文件的进度条有点特殊,有进度的消息的进度条有点特殊 -->
14-
<FadeLoader :loading="message.status === 0 && message.messageContent.type !== 5" color="#848484" style="margin:10px" width="3px" height="8px" margin="2px" radius="8px"> </FadeLoader>
14+
<FadeLoader :loading="message.status === 0 && message.messageContent.type !== 5" color="#848484" style="margin:10px" width="3px" height="8px" margin="2px" radius="8px"></FadeLoader>
1515
<i v-if="message.status === 2" class="icon-ion-close-circled" style="color: red" @click="resend"/>
1616
<div class="flex-column flex-align-end">
1717
<MessageContentContainerView :message="message"
@@ -226,7 +226,13 @@ export default {
226226
},
227227
228228
shouldShowMessageReceipt() {
229-
return this.sharedConversationState.isMessageReceiptEnable && ["FireRobot", Config.FILE_HELPER_ID].indexOf(this.message.conversation.target) < 0;
229+
let show = false;
230+
if (this.message.conversation.type === ConversationType.Group) {
231+
show = this.sharedConversationState.isGroupMessageReceiptEnable;
232+
} else if (this.message.conversation.type === ConversationType.Single) {
233+
show = this.sharedConversationState.isMessageReceiptEnable && ["FireRobot", Config.FILE_HELPER_ID].indexOf(this.message.conversation.target) < 0;
234+
}
235+
return show;
230236
}
231237
},
232238

src/wfc/client/wfc.js

+9
Original file line numberDiff line numberDiff line change
@@ -1948,6 +1948,15 @@ export class WfcManager {
19481948
return impl.isReceiptEnabled();
19491949
}
19501950

1951+
/**
1952+
*
1953+
* 群里面是否开启了已送达报告和已读报告功能
1954+
* @return {boolean}
1955+
*/
1956+
isGroupReceiptEnabled() {
1957+
return impl.isGroupReceiptEnabled();
1958+
}
1959+
19511960
/**
19521961
* 当前用户是否开启消息回执
19531962
* @return {boolean}

0 commit comments

Comments
 (0)