yangjie #49

Merged
yangqiang merged 71 commits from yangjie into master 2025-03-10 14:21:26 +08:00
1 changed files with 17 additions and 17 deletions
Showing only changes of commit 864f305acf - Show all commits

View File

@ -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<void> => {
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
})
}
}