优化群组通知显示

comsince · comsince · commit 9862b65682f5 · 2020-04-23T18:15:23.000+08:00
diff --git a/src/components/chatlist/chatlist.vue b/src/components/chatlist/chatlist.vue
@@ -30,6 +30,8 @@ import { mapState, mapActions ,mapGetters } from 'vuex'
 import ConversationType from '../../websocket/model/conversationType';
 import LocalStore from '../../websocket/store/localstore';
 import TimeUtils from '../../websocket/utils/timeUtils';
+import MessageConfig from '../../websocket/message/messageConfig';
+import NotificationMessageContent from '../../websocket/message/notification/notificationMessageContent';
 export default {
     computed: {
    	    ...mapState([
@@ -52,25 +54,47 @@ export default {
             var protoConversationInfo = item.conversationInfo;
             var displayContent;
             if(protoConversationInfo.lastMessage){
-                displayContent = protoConversationInfo.lastMessage.content.searchableContent;
-                if(protoConversationInfo.lastMessage.content.type === 400){
-                    displayContent = '[网络电话]';
-                }
-                var isCurrentUser = protoConversationInfo.lastMessage.from === LocalStore.getUserId();
-                if(protoConversationInfo.conversationType == ConversationType.Group && !isCurrentUser){
-                    var from = protoConversationInfo.lastMessage.from;
-                    var displayUserInfo = this.userInfoList.find(userInfo => userInfo.uid == from);
-                    var displayName = from;
-                    if(displayUserInfo){
-                        displayName = displayUserInfo.displayName;
-                        if(!displayName){
-                            displayName = displayUserInfo.mobile;
+                var messageContent = MessageConfig.convert2MessageContent(protoConversationInfo.lastMessage.from,protoConversationInfo.lastMessage.content);
+                if(messageContent && messageContent instanceof NotificationMessageContent){
+                    if(!messageContent.fromSelf){
+                        displayContent = this.getDisplayName(protoConversationInfo.lastMessage.from)+":"+messageContent.formatNotification();
+                    } else {
+                        displayContent = messageContent.formatNotification();
+                    }
+                    console.log("notification message "+displayContent);
+                } else {
+                    displayContent = protoConversationInfo.lastMessage.content.searchableContent;
+                    if(protoConversationInfo.lastMessage.content.type === 400){
+                        displayContent = '[网络电话]';
+                    }
+                    var isCurrentUser = protoConversationInfo.lastMessage.from === LocalStore.getUserId();
+                    if(protoConversationInfo.conversationType == ConversationType.Group && !isCurrentUser){
+                        var from = protoConversationInfo.lastMessage.from;
+                        var displayUserInfo = this.userInfoList.find(userInfo => userInfo.uid == from);
+                        var displayName = from;
+                        if(displayUserInfo){
+                            displayName = displayUserInfo.displayName;
+                            if(!displayName){
+                                displayName = displayUserInfo.mobile;
+                            }
                         }
+                        displayContent = displayName +":"+protoConversationInfo.lastMessage.content.searchableContent;
                     }
-                    displayContent = displayName +":"+protoConversationInfo.lastMessage.content.searchableContent;
                 }
+                
             }
            return displayContent;
+        },
+        getDisplayName(from){
+            var displayUserInfo = this.userInfoList.find(userInfo => userInfo.uid == from);
+            var displayName = from;
+            if(displayUserInfo){
+                displayName = displayUserInfo.displayName;
+                if(!displayName){
+                    displayName = displayUserInfo.mobile;
+                }
+            }
+            return displayName;
         }	
     },
     filters: {
diff --git a/src/components/message/message.vue b/src/components/message/message.vue
@@ -13,8 +13,9 @@
 		    <ul v-if="selectedChat">
 		    	<li v-bind:key = index v-for="(item, index) in selectedChat.protoMessages" class="message-item">
 		    		<div v-if="isShowTime(index,selectedChat.protoMessages)" class="time"><span>{{item.timestamp | getTimeStringAutoShort2}}</span></div>
-                    <div v-if="item.content.type === 104" class="time"><span>{{notification(item.content.binaryContent,item.content.type)}}</span></div>
-                    <div v-if="item.content.type === 110" class="time"><span>{{notification(item.content.binaryContent,item.content.type)}}</span></div>
+                    <!-- <div v-if="item.content.type === 104" class="time"><span>{{notification(item.content.binaryContent,item.content.type)}}</span></div>
+                    <div v-if="item.content.type === 110" class="time"><span>{{notification(item.content.binaryContent,item.content.type)}}</span></div> -->
+                    <div v-if="isGroupNotification(item)" class="time"><span>{{groupNotification(item)}}</span></div>
                     <div v-if="item.content.type === 90" class="time"><span>{{item.content.content}}</span></div>
 		    		<div v-if="!isNotification(item.content.type)" class="main" :class="{ self: item.direction == 0 ? true : false }">
                         <img class="avatar" width="36" height="36" :src="avatarSrc(item)"
@@ -68,6 +69,9 @@ import Vue from 'vue'
 Vue.use(Viewer)
 import CryptoJS from 'crypto-js'
 import groupInfo from '../menu/groupInfo'
+import MessageConfig from '../../websocket/message/messageConfig';
+import NotificationMessageContent from '../../websocket/message/notification/notificationMessageContent';
+import GroupNotificationContent from '../../websocket/message/notification/groupNotification';
 export default {
     components:{
         Xgplayer,
@@ -213,6 +217,35 @@ export default {
             return notificationContent;
         },
 
+        isGroupNotification(protoMessage){
+           var contentClass = MessageConfig.getMessageContentClazz(protoMessage.content.type);
+           var content = new contentClass();
+           return content instanceof GroupNotificationContent;
+        },
+
+        groupNotification(protoMessage){
+            var displayContent;
+            var messageContent = MessageConfig.convert2MessageContent(protoMessage.from,protoMessage.content);
+            if(!messageContent.fromSelf){
+                displayContent = this.getDisplayName(protoMessage.from)+":"+messageContent.formatNotification();
+            } else {
+                displayContent = messageContent.formatNotification();
+            }
+            return displayContent;
+        },
+
+        getDisplayName(from){
+            var displayUserInfo = this.userInfoList.find(userInfo => userInfo.uid == from);
+            var displayName = from;
+            if(displayUserInfo){
+                displayName = displayUserInfo.displayName;
+                if(!displayName){
+                    displayName = displayUserInfo.mobile;
+                }
+            }
+            return displayName;
+        },
+
         isNotification(type){
             return type >= 80 && type <= 117 
         },
diff --git a/src/store.js b/src/store.js
@@ -454,7 +454,7 @@ const mutations = {
      */
     updateConversationIntro(state,groupInfos){
         for(var groupInfo of groupInfos){
-           var stateConverstaionInfo = state.conversations.find(stateConverstaionInfo => stateConverstaionInfo.name === groupInfo.target);
+           var stateConverstaionInfo = state.conversations.find(stateConverstaionInfo => stateConverstaionInfo.conversationInfo.target === groupInfo.target);
            if(stateConverstaionInfo){
             console.log("update conversation name "+stateConverstaionInfo.name);
                stateConverstaionInfo.name = groupInfo.name;
diff --git a/src/websocket/message/messageConfig.js b/src/websocket/message/messageConfig.js
@@ -10,6 +10,10 @@ import CallSignalMessageContent from '../../webrtc/message/callSignalMessageCont
 import ImageMessageContent from './imageMessageContent'
 import CallByeMessageContent from '../../webrtc/message/callByeMessageContent'
 import CallModifyMessageContent from '../../webrtc/message/callModifyMessageContent'
+import CreateGroupNotification from './notification/createGroupNotification'
+import ChangeGroupNameNotification from './notification/changeGroupNameNotification'
+import NotificationMessageContent from './notification/notificationMessageContent'
+import LocalStore from '../store/localstore'
 export default class MessageConfig{
     static getMessageContentClazz(type) {
         for (const content of MessageConfig.MessageContents) {
@@ -25,6 +29,24 @@ export default class MessageConfig{
         return UnknownMessageContent;
     }
 
+    static convert2MessageContent(from,protoMessageContent){
+        var messageContent = null;
+        var contentClazz =  this.getMessageContentClazz(protoMessageContent.type);
+        if(contentClazz != UnsupportMessageContent){
+           let content = new contentClazz();
+           try {
+               content.decode(protoMessageContent);
+               if (content instanceof NotificationMessageContent) {
+                    content.fromSelf = from === LocalStore.getUserId();
+               }
+               messageContent = content;
+           }catch(error){
+               console.log("decode message content error "+protoMessageContent);
+           }
+        } 
+        return messageContent;
+    }
+
 
     static getMessageContentPersitFlag(type) {
         for (const content of MessageConfig.MessageContents) {
@@ -118,6 +140,7 @@ export default class MessageConfig{
             name: 'changeGroupNameNotification',
             flag: PersistFlag.Persist,
             type: MessageContentType.ChangeGroupName_Notification,
+            contentClazz: ChangeGroupNameNotification
         },
         {
             name: 'changeGroupPortraitNotification',
@@ -128,6 +151,7 @@ export default class MessageConfig{
             name: 'createGroupNotification',
             flag: PersistFlag.Persist,
             type: MessageContentType.CreateGroup_Notification,
+            contentClazz: CreateGroupNotification
         },
         {
             name: 'dismissGroupNotification',
diff --git a/src/websocket/message/notification/changeGroupNameNotification.js b/src/websocket/message/notification/changeGroupNameNotification.js
@@ -0,0 +1,44 @@
+import MessageContentType from "../messageContentType";
+
+import GroupNotificationContent from "./groupNotification";
+import StringUtils from '../../utils/StringUtil'
+
+export default class ChangeGroupNameNotification extends GroupNotificationContent {
+    operator = '';
+    name = '';
+
+    constructor(operator, name) {
+        super(MessageContentType.ChangeGroupName_Notification);
+        this.operator = operator;
+        this.name = name;
+    }
+
+    formatNotification() {
+        if (this.fromSelf) {
+            return '您修改群名称为：' + this.name;
+        } else {
+            return '修改群名称为：' + this.name;
+        }
+    }
+
+    encode() {
+        let payload = super.encode();
+        let obj = {
+            g: this.groupId,
+            n: this.name,
+            o: this.operator,
+        };
+        payload.binaryContent = StringUtils.utf8_to_b64(JSON.stringify(obj));
+        return payload;
+    }
+
+    decode(payload) {
+        super.decode(payload);
+        let json = StringUtils.b64_to_utf8(payload.binaryContent)
+        let obj = JSON.parse(json);
+        this.groupId = obj.g;
+        this.operator = obj.o;
+        this.name = obj.n;
+    }
+
+}
diff --git a/src/websocket/message/notification/createGroupNotification.js b/src/websocket/message/notification/createGroupNotification.js
@@ -0,0 +1,43 @@
+import MessageContentType from '../messageContentType';
+
+import GroupNotificationContent from './groupNotification';
+import StringUtils from '../../utils/StringUtil'
+
+export default class CreateGroupNotification extends GroupNotificationContent {
+    creator = '';
+    groupName = '';
+
+    constructor(creator, groupName) {
+        super(MessageContentType.CreateGroup_Notification);
+        this.creator = creator;
+        this.groupName = groupName;
+    }
+
+    formatNotification() {
+        if (this.fromSelf) {
+            return '您创建了群组 ' + this.groupName;
+        } else {
+            return  '创建了群组 ' + this.groupName;
+        }
+    }
+
+    encode() {
+        let payload = super.encode();
+        let obj = {
+            g: this.groupId,
+            n: this.groupName,
+            o: this.creator,
+        };
+        payload.binaryContent = StringUtils.utf8_to_b64(JSON.stringify(obj));
+        return payload;
+    }
+
+    decode(payload) {
+        super.decode(payload);
+        let json = StringUtils.b64_to_utf8(payload.binaryContent)
+        let obj = JSON.parse(json);
+        this.groupId = obj.g;
+        this.creator = obj.o;
+        this.groupName = obj.n;
+    }
+}
diff --git a/src/websocket/message/notification/groupNotification.js b/src/websocket/message/notification/groupNotification.js
@@ -0,0 +1,5 @@
+import NotificationMessageContent from "./notificationMessageContent";
+
+export default class GroupNotificationContent extends NotificationMessageContent {
+    groupId = '';
+}
diff --git a/src/websocket/message/notification/notificationMessageContent.js b/src/websocket/message/notification/notificationMessageContent.js
@@ -0,0 +1,22 @@
+import MessageContent from "../messageContent";
+export default class NotificationMessageContent extends MessageContent {
+    // message#protoMessageToMessage时设置
+    fromSelf = false;
+    constructor(type) {
+        super(type);
+    }
+
+    digest(message) {
+        var desc = '';
+        try {
+            desc = this.formatNotification(message);
+        } catch (error) {
+            console.log('disgest', error);
+        }
+        return desc;
+    };
+
+    formatNotification(message) {
+        return '..nofication..';
+    }
+}
