From 5464d9a35baa297f67a2324106b9d2ef999b4963 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Tue, 20 Aug 2024 14:25:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Meeting/index.tsx | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index f0b8923..93331c5 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -322,6 +322,11 @@ const Meeting: React.FC = () => {
           break;
         // 发言人用户信息刷新
         case 'ManagerRefresh':
+          if (item.user.uid === userInfo.uid) {
+            await agora.updateChannelMediaOptions(item.user.isRoomManager)
+            await postOpenMicrApi(item.user.isRoomManager, userInfo.uid)
+            await postOpenCameraApi(item.user.isRoomManager, userInfo.uid)
+          }
           setAllUserListData('ManagerRefresh', item)
           break;
       }
@@ -389,7 +394,7 @@ const Meeting: React.FC = () => {
       });
     }
     setRoomUserList((res: any) => {
-      res.forEach((item: any) => {
+      res.forEach(async (item: any) => {
         if (item.roleId === '1') {
           item.role = 'admin'
         } else if (item.isRoomManager) {
@@ -404,8 +409,8 @@ const Meeting: React.FC = () => {
           footerListTemplate[0][1].title = item.enableCamera ? '关闭视频' : '开启视频'
           footerListTemplate[0][1].active = !item.enableCamera
           setFooterList(footerListTemplate)
-          agora.muteLocalAudioStream(!item.enableMicr)
-          agora.muteLocalVideoStream(!item.enableCamera)
+          await agora.muteLocalAudioStream(!item.enableMicr)
+          await agora.muteLocalVideoStream(!item.enableCamera)
         }
         if (userSearchValue) {
           if (item.userName.indexOf(userSearchValue) !== -1) {
@@ -417,7 +422,7 @@ const Meeting: React.FC = () => {
           item.isShow = true;
         }
       });
-      return res
+      return sortUsersByRole(res)
     })
   }
   // 替换数据
@@ -426,20 +431,14 @@ const Meeting: React.FC = () => {
       case 'OperMicr':
       case 'OperCamera':
       case 'ManagerRefresh':
-        setRoomUserList(async (res: any) => {
+        setRoomUserList((res: any) => {
           let userItem = res.find((row: any) => row.uid === item.user.uid)
           if (userItem) {
             for (const key in item.user) {
               userItem[key] = item.user[key];
             }
           }
-          if (key === 'ManagerRefresh') {
-            if (item.user.uid === userInfo.uid) {
-              await agora.updateChannelMediaOptions(item.user.isRoomManager)
-              await postOpenMicrApi(item.user.isRoomManager, userInfo.uid)
-              await postOpenCameraApi(item.user.isRoomManager, userInfo.uid)
-            }
-          }
+          setRoomUserList(res)
           return res
         })
         break;
@@ -1567,7 +1566,7 @@ const meetingContentUser = (item: any, bool?: boolean) => {
               <img src={ImageUrl.icon32} alt="" />
             </div> : null}
           {!item.enableMicr ? <img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" /> : ''}
-          <span style={{ maxWidth: bool ? '' : '8vw' }} title={`${item.userName}${item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''}`}>
+          <span style={{ width: bool ? '' : '8vw' }} title={`${item.userName}${item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''}`}>
             {item.userName}
             {item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''}
           </span>