yangjie #22

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

View File

@ -1574,6 +1574,13 @@ const Meeting: React.FC = () => {
setIsScreenCapture(true) setIsScreenCapture(true)
window.electron.setViewStatus('hide') window.electron.setViewStatus('hide')
if (!isOpen) { if (!isOpen) {
window.electron.createChildWindow({
url: location.origin + `/#/noticeWindow`,
width: 388,
height: 150,
key: 'noticeWindow',
show: true,
})
window.electron.createChildWindow({ window.electron.createChildWindow({
url: location.origin + `/#/shareScreenWindow`, url: location.origin + `/#/shareScreenWindow`,
width: 400, width: 400,
@ -1595,13 +1602,6 @@ const Meeting: React.FC = () => {
key: 'currentSpeakUserWindow', key: 'currentSpeakUserWindow',
show: true, show: true,
}) })
window.electron.createChildWindow({
url: location.origin + `/#/noticeWindow`,
width: 388,
height: 150,
key: 'noticeWindow',
show: true,
})
window.electron.createChildWindow({ window.electron.createChildWindow({
url: location.origin + `/#/chatBigWindow`, url: location.origin + `/#/chatBigWindow`,
width: 540, width: 540,