diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 4f06cb4..33f879b 100644 --- a/src/page/Meeting/index.tsx +++ b/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 - }) + getShowUser() break; } }) @@ -1737,12 +1726,23 @@ const Meeting: React.FC = () => { }, 500); } // 全员观看 - const getShowUser = async (): Promise => { + const getShowUser = () => { if (location.href.indexOf('/meeting') !== -1) { - await GetShowUser(state.channelId).then(async (res) => { - if (res.code === 200 && res.data) { - renderVideo(res.data) - } + setRoomUserList((newChatList: any) => { + setActiveSpeaker(res => { + 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 }) } }