yangjie #22

Merged
yangqiang merged 99 commits from yangjie into master 2024-10-22 16:11:46 +08:00
1 changed files with 13 additions and 11 deletions
Showing only changes of commit eee14c037d - Show all commits

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,6 +1507,7 @@ const Meeting: React.FC = () => {
setFooterList(footerListTemplate) setFooterList(footerListTemplate)
window.electron.closeChildWindow('shareScreenWindow') window.electron.closeChildWindow('shareScreenWindow')
setKeyOpenChildWindow('shareScreenWindow', false) setKeyOpenChildWindow('shareScreenWindow', false)
if (isShare === userInfo.screenShareId) {
window.electron.getWindowSize().then((res: any) => { window.electron.getWindowSize().then((res: any) => {
window.electron.setMainWindowSize({ window.electron.setMainWindowSize({
width: Math.ceil(res.width / 1.5), width: Math.ceil(res.width / 1.5),
@ -1519,6 +1520,7 @@ const Meeting: React.FC = () => {
}) })
}) })
} }
}
// 获取房间用户 // 获取房间用户
const getRoomUser = async (): Promise<void> => { const getRoomUser = async (): Promise<void> => {
GetRoomUser(state.channelId).then(res => { GetRoomUser(state.channelId).then(res => {