src/page/Meeting/index.tsx

@@ -1003,18 +1003,7 @@ const Meeting: React.FC = () => {
           break;
         // 共享人取消共享屏幕
         case 'StopedSharedScreen':
-          setRoomUserList((newChatList: any) => {
-            setActiveSpeaker(res => {
-              let item = newChatList.find((item: any) => item.uid === res)
-              if (item && item.isRoom && item.isAdmin) {
-                renderVideo(res)
-              } else {
           getShowUser()
-              }
-              return res
-            })
-            return newChatList
-          })
           break;
       }
     })
@@ -1737,14 +1726,25 @@ const Meeting: React.FC = () => {
     }, 500);
   }
   // 全员观看
-  const getShowUser = async (): Promise<void> => {
+  const getShowUser = () => {
     if (location.href.indexOf('/meeting') !== -1) {
-      await GetShowUser(state.channelId).then(async (res) => {
+      setRoomUserList((newChatList: any) => {
-        if (res.code === 200 && res.data) {
+        setActiveSpeaker(res => {
-          renderVideo(res.data)
+          let item = newChatList.find((item: any) => item.uid === res)
+          if (item && item.isRoom && item.isAdmin) {
+            renderVideo(res)
+          } else {
+            GetShowUser(state.channelId).then((req) => {
+              if (req.code === 200 && req.data) {
+                renderVideo(req.data)
               }
             })
           }
+          return res
+        })
+        return newChatList
+      })
+    }
   }
   // 加入房间时间
   const changeCurrentSeconds = (): string => {