From a4b24252d69bb641bca1d1f45ba6cc628da4322b Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 21 Aug 2024 09:45:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Meeting/index.tsx   | 17 ++++++++++++++---
 src/utils/package/signalr.ts |  4 ++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 4323d60..ba81ee6 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -258,7 +258,7 @@ const Meeting: React.FC = () => {
           setStatusList((res: any) => {
             if (!res.userChatList) {
               api.open({
-                message: '消息',
+                message: item.userName,
                 description: item.message,
                 duration: 3,
                 showProgress: true,
@@ -341,9 +341,12 @@ const Meeting: React.FC = () => {
         case 'ManagerRefresh':
           setAllUserListData('ManagerRefresh', item, async () => {
             if (item.user.uid === userInfo.uid) {
+              message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}您为发言人`)
               await agora.updateChannelMediaOptions(item.user.isRoomManager)
               await postOpenMicrApi(item.user.isRoomManager, userInfo.uid)
               await postOpenCameraApi(item.user.isRoomManager, userInfo.uid)
+            } else {
+              message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`)
             }
           })
           break;
@@ -798,6 +801,7 @@ const Meeting: React.FC = () => {
         uid: user.uid,
         userName: user.userName,
         message: msg,
+        timestamp: +new Date()
       }])
       setTextMsg('');
       chatScrollBotton()
@@ -1423,11 +1427,18 @@ const Meeting: React.FC = () => {
                               }>
                               <div>
                                 <div><Avatar name={item.userName} /></div>
-                                <span>{item.userName}</span>
+                                {item.uid !== user.uid ?
+                                  <span>{item.userName} <span style={{ fontSize: '12px', color: '#ccc' }}>{dayjs(item.timestamp).format('HH:mm:ss')}</span></span> :
+                                  <span> <span style={{ fontSize: '12px', color: '#ccc' }}>{dayjs(item.timestamp).format('HH:mm:ss')} </span>{item.userName}</span>
+                                }
+
                               </div>
                             </Popover> : <div>
                               <div><Avatar name={item.userName} /></div>
-                              <span>{item.userName}</span>
+                              {item.uid !== user.uid ?
+                                <span>{item.userName} <span style={{ fontSize: '12px', color: '#ccc' }}>{dayjs(item.timestamp).format('HH:mm:ss')}</span></span> :
+                                <span><span style={{ fontSize: '12px', color: '#ccc' }}>{dayjs(item.timestamp).format('HH:mm:ss')} </span>{item.userName}</span>
+                              }
                             </div>}
                             <div>{item.message}</div>
                           </div>
diff --git a/src/utils/package/signalr.ts b/src/utils/package/signalr.ts
index ca847f1..206ca92 100644
--- a/src/utils/package/signalr.ts
+++ b/src/utils/package/signalr.ts
@@ -57,10 +57,10 @@ export const onOtherSignalr = (callBack: Function) => {
 export const onSignalr = (callBack: Function) => {
   if (connection) {
     // 聊天
-    connection.on("ReceiveMessage", (uid: string, userName: string, message: string) => {
+    connection.on("ReceiveMessage", (uid: string, userName: string, message: string, timestamp: string) => {
       callBack({
         key: 'ReceiveMessage',
-        uid, message, userName
+        uid, message, userName, timestamp
       })
     });
     // 扩展操作