yangjie #28

Merged
yangqiang merged 32 commits from yangjie into master 2024-10-29 15:15:48 +08:00
1 changed files with 5 additions and 2 deletions
Showing only changes of commit 42059e3c6f - Show all commits

View File

@ -573,7 +573,7 @@ const Meeting: React.FC = () => {
setIsShare((res: any) => {
if (userInfo.screenShareId === String(res)) {
changeStatusList({
title: '停止共享'
title: '共享冲突停止共享',
}, 1, 0)
}
return res
@ -1380,6 +1380,7 @@ const Meeting: React.FC = () => {
})
break;
case '停止共享':
case '共享冲突停止共享':
await getUserRoomInfo().then(async (res) => {
if (res) {
await stopScreenCapture()
@ -1387,7 +1388,9 @@ const Meeting: React.FC = () => {
message.error(msgTips)
}
})
await allUserLook(userInfo.uid, userInfo.userName)
if (row.title === '停止共享') {
await allUserLook(userInfo.uid, userInfo.userName)
}
break;
case '静音':
await postOpenMicr(false, userInfo.uid)