yangjie #33

Merged
yangqiang merged 22 commits from yangjie into master 2024-11-04 13:57:51 +08:00
2 changed files with 17 additions and 13 deletions
Showing only changes of commit d038f251e2 - Show all commits

View File

@ -203,7 +203,7 @@ app.on('ready', () => {
break; break;
case 'joinChannel': case 'joinChannel':
// 设置某个人的设备列表 // 设置某个人的设备列表
await connection.invoke(str, data.roomNum, data.enableMicr, data.enableCamera) await connection.invoke(str, data.roomNum, data.enableMicr, data.enableCamera, data.isRoomManager || false)
break; break;
case 'levelChannel': case 'levelChannel':
// 设置某个人的设备列表 // 设置某个人的设备列表

View File

@ -191,6 +191,7 @@ const Meeting: React.FC = () => {
let userInfo = JSON.parse(storage.getItem('user') as string) let userInfo = JSON.parse(storage.getItem('user') as string)
const msgTips = '您不是管理员或发言人,无法开启此功能!' const msgTips = '您不是管理员或发言人,无法开启此功能!'
const channel = new BroadcastChannel('meeting_channel'); const channel = new BroadcastChannel('meeting_channel');
let storeDevice: any;
useEffect(() => { useEffect(() => {
let time: NodeJS.Timeout; let time: NodeJS.Timeout;
setUser(userInfo) setUser(userInfo)
@ -1736,22 +1737,20 @@ const Meeting: React.FC = () => {
break; break;
case 'reconnect': case 'reconnect':
if (e.value == true) { if (e.value == true) {
await window.electron.onInvoke('joinChannel', {
roomNum: state.channelId,
enableMicr: !footerList[0][0].active,
enableCamera: !footerList[0][1].active
})
message.success('网络已连接。') message.success('网络已连接。')
meetingDisconnectedRef.current.changeModal(false) meetingDisconnectedRef.current.changeModal(false)
setRoomUserList((res: any) => { async function setUserStatus(res: any) {
let userItem = res.find((item: any) => item.uid === userInfo.uid) let userItem = res.find((item: any) => item.uid === userInfo.uid)
if (userItem.isRoomManager) { await window.electron.onInvoke('joinChannel', {
stopScreenCapture()
postRoomManager({
roomId: state.roomId,
roomNum: state.channelId, roomNum: state.channelId,
userId: userItem.uid enableMicr: !storeDevice[0][0].active,
enableCamera: !storeDevice[0][1].active,
isRoomManager: userItem.isRoomManager
}) })
if (userItem.isRoomManager) {
await stopScreenCapture()
await postOpenMicr(!storeDevice[0][0].active, userInfo.uid)
await postOpenCamera(!storeDevice[0][1].active, userInfo.uid)
allUserLook(userItem.uid, userItem.userName) allUserLook(userItem.uid, userItem.userName)
} else { } else {
setIsNetworkDisconnected(bool => { setIsNetworkDisconnected(bool => {
@ -1767,8 +1766,13 @@ const Meeting: React.FC = () => {
return bool return bool
}) })
} }
}
setRoomUserList((res: any) => {
setUserStatus(res)
return res return res
}) })
} else {
storeDevice = JSON.parse(JSON.stringify(footerList))
} }
break; break;
} }