还原

src/page/Meeting/index.tsx

@@ -367,7 +367,7 @@ const Meeting: React.FC = () => {
               message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`)
             }
             if (!item.user.isRoomManager) {
-              renderVideo(item.user.uid)
+              changeVideo()
             }
           })
           break;
@@ -566,6 +566,20 @@ const Meeting: React.FC = () => {
     }
     changeAgoraDevice()
   }
+  // 修改当前观看用户
+  const changeVideo = (): void => {
+    setRoomUserList((list: any) => {
+      let row = list.filter((i: any) => i.roleId === '1' || i.isRoomManager)
+      setCurrentLookUserAccount((res: any) => {
+        let has = row.find((x: any) => x.uid === res.uid)
+        if (!has) {
+          renderVideo(row[0].uid)
+        }
+        return res
+      })
+      return list
+    })
+  }
   // 网络
   const handleNetworkChange = (): void => {
     if (navigator.onLine) {
@@ -580,20 +594,14 @@ const Meeting: React.FC = () => {
     }
   }
   // 渲染视频
-  const renderVideo = async (uid: string = ''): Promise<void> => {
-    // if ((uid && currentVideoId === uid) || clickCurrentLookUserStatus === false) {
-    //   return
-    // }
+  const renderVideo = async (uid: string): Promise<void> => {
+    if (currentVideoId === uid || clickCurrentLookUserStatus === false) {
+      return
+    }
     setClickCurrentLookUserStatus(false)
     setCurrentLookUserStatus(0)
-    setRoomUserList((list: any) => {
-      let row = list.filter((i: any) => i.roleId === '1' || i.isRoomManager)
-      setCurrentLookUserAccount((res: any) => {
-        let has = row.find((x: any) => x.uid === res.uid)
-        if (!has && row.length) {
-          uid = row[0].uid;
-        }
-        let item = list.find((item: any) => item.uid === uid || item.screenShareId === uid)
+    setRoomUserList((res: any) => {
+      let item = res.find((item: any) => item.uid === uid || item.screenShareId === uid)
       if (item) {
         setCurrentVideoId(item.uid)
       }
@@ -652,14 +660,13 @@ const Meeting: React.FC = () => {
         }
       }
     }, 1000)
-      return list
-    })
   }
   // 全员观看
   const getShowUser = async (): Promise<void> => {
     await GetShowUser(state.channelId).then(async (res) => {
       if (res.code === 200 && res.data) {
         renderVideo(res.data)
+        changeVideo()
       }
     })
   }