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

yangjie #22

Merged
yangqiang merged 99 commits from yangjie into master 2024-10-22 16:11:46 +08:00
Conversation 0 Commits 99 Files Changed 34 +13 -11
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eee14c037d - Show all commits

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

@ -549,7 +549,7 @@ const Meeting: React.FC = () => {
} }
} else { } else {
if (item.user.uid === userInfo.uid) { if (item.user.uid === userInfo.uid) {
if (!item.user.isRoomManager) { if (item.user.isRoomManager) {
await agora.allLeaveChannelEx() await agora.allLeaveChannelEx()
} }
message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}您为发言人`) message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}您为发言人`)
@ -1507,17 +1507,19 @@ const Meeting: React.FC = () => {
setFooterList(footerListTemplate) setFooterList(footerListTemplate)
window.electron.closeChildWindow('shareScreenWindow') window.electron.closeChildWindow('shareScreenWindow')
setKeyOpenChildWindow('shareScreenWindow', false) setKeyOpenChildWindow('shareScreenWindow', false)
window.electron.getWindowSize().then((res: any) => { if (isShare === userInfo.screenShareId) {
window.electron.setMainWindowSize({ window.electron.getWindowSize().then((res: any) => {
width: Math.ceil(res.width / 1.5), window.electron.setMainWindowSize({
height: Math.ceil(res.height / 1.3), width: Math.ceil(res.width / 1.5),
height: Math.ceil(res.height / 1.3),
})
window.electron.getIsMaximized().then((b: boolean) => {
if (!b) {
window.electron.setViewStatus('maximize')
}
})
}) })
window.electron.getIsMaximized().then((b: boolean) => { }
if (!b) {
window.electron.setViewStatus('maximize')
}
})
})
} }
// 获取房间用户 // 获取房间用户
const getRoomUser = async (): Promise<void> => { const getRoomUser = async (): Promise<void> => {