From fda668cae28bfd2becff0b4dff6bf2c232fef437 Mon Sep 17 00:00:00 2001
From: bob <312777916@qq.com>
Date: Sun, 15 Sep 2024 14:01:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81-2=EF=BC=9A?=
 =?UTF-8?q?sessionType=E7=BB=9F=E4=B8=80=E5=92=8CMsgType=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/message/SessionBox.vue | 17 +++++++++--------
 src/views/message/MessageLayout.vue   | 11 ++++++-----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/message/SessionBox.vue b/src/components/message/SessionBox.vue
index 2332a63..5ca037f 100644
--- a/src/components/message/SessionBox.vue
+++ b/src/components/message/SessionBox.vue
@@ -6,6 +6,7 @@ import UserCard from '../user/UserCard.vue'
 import GroupCard from '../group/GroupCard.vue'
 import { sessionShowTime } from '@/utils/common'
 import { Top, Bottom, MuteNotification, Bell } from '@element-plus/icons-vue'
+import { MsgType } from '@/proto/msg'
 
 const props = defineProps(['sessionId', 'sessionType', 'objectInfo'])
 const emit = defineEmits(['exportData'])
@@ -24,9 +25,9 @@ const sessionInfo = computed(() => {
 
 const showName = computed(() => {
   switch (props.sessionType) {
-    case 'chat':
+    case MsgType.CHAT:
       return props.objectInfo.nickName
-    case 'groupchat':
+    case MsgType.GROUP_CHAT:
       return props.objectInfo.groupName
     default:
       return ''
@@ -35,9 +36,9 @@ const showName = computed(() => {
 
 const showId = computed(() => {
   switch (props.sessionType) {
-    case 'chat':
+    case MsgType.CHAT:
       return props.objectInfo.account
-    case 'groupchat':
+    case MsgType.GROUP_CHAT:
       return props.objectInfo.groupId
     default:
       return ''
@@ -46,8 +47,8 @@ const showId = computed(() => {
 
 const showAvatarThumb = computed(() => {
   switch (props.sessionType) {
-    case 'chat':
-    case 'groupchat':
+    case MsgType.CHAT:
+    case MsgType.GROUP_CHAT:
       return props.objectInfo.avatarThumb
     default:
       return ''
@@ -68,10 +69,10 @@ const handleGroupCard = (flag) => {
 }
 const showSomeoneCard = () => {
   switch (props.sessionType) {
-    case 'chat':
+    case MsgType.CHAT:
       isShowUserCard.value = true
       break
-    case 'groupchat':
+    case MsgType.GROUP_CHAT:
       isShowGroupCard.value = true
       break
     default:
diff --git a/src/views/message/MessageLayout.vue b/src/views/message/MessageLayout.vue
index 5cc30c1..216b135 100644
--- a/src/views/message/MessageLayout.vue
+++ b/src/views/message/MessageLayout.vue
@@ -78,9 +78,9 @@ onMounted(async () => {
 
 const showName = computed(() => {
   switch (curSessionType.value) {
-    case 'chat':
+    case MsgType.CHAT:
       return curObject.value.nickName
-    case 'groupchat':
+    case MsgType.GROUP_CHAT:
       return curObject.value.groupName
     default:
       return ''
@@ -89,9 +89,9 @@ const showName = computed(() => {
 
 const showId = computed(() => {
   switch (curSessionType.value) {
-    case 'chat':
+    case MsgType.CHAT:
       return curObject.value.account
-    case 'groupchat':
+    case MsgType.GROUP_CHAT:
       return curObject.value.groupId
     default:
       return ''
@@ -135,6 +135,7 @@ const handleExportData = (data) => {
 }
 // 发送事件要做的事情
 const handleExportContent = (content) => {
+  // TODO 这里还要考虑失败情况：1）消息发不出去；2）消息发出去了，服务器不发“已发送”
   wsConnect.sendMsg(curObject.value.account, MsgType.CHAT, content, (deliveredMsg) => {
     messageData.addMsgRecord(curSessionId.value, {
       msgId: deliveredMsg.body.msgId,  
@@ -207,7 +208,7 @@ watch(() => messageData.msgRecords[curSessionId.value], () => {
         <el-header class="header bdr-b">
           <div class="show-name-id">
             <span class="show-name">{{ showName }}</span>
-            <span v-if="curSessionType === 'chat'" class="show-id">{{ showId }}</span>
+            <span v-if="curSessionType === MsgType.CHAT" class="show-id">{{ showId }}</span>
           </div>
 
           <div class="action-set">