marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

yangjie #28

Merged
yangqiang merged 32 commits from yangjie into master 2024-10-29 15:15:48 +08:00
Conversation 0 Commits 32 Files Changed 23 +5 -2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 42059e3c6f - Show all commits

7
src/page/Meeting/index.tsx
View File

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