yangjie #22

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

View File

@ -349,6 +349,14 @@ app.on('ready', () => {
break; break;
} }
}); });
// 隐藏显示子窗口
ipcMain.handle('setChildWindowShow', (event, config) => {
if (config.bool) {
childWindow[config.key].show()
} else {
childWindow[config.key].hide()
}
});
// 隐藏主窗口 // 隐藏主窗口
ipcMain.handle('mainWindowHide', () => { ipcMain.handle('mainWindowHide', () => {
mainWindowHide() mainWindowHide()

View File

@ -94,6 +94,10 @@ window.electron = {
ipcRenderer.invoke('setChildWindow', config) ipcRenderer.invoke('setChildWindow', config)
}, },
// 隐藏主窗口 // 隐藏主窗口
setChildWindowShow: (config) => {
ipcRenderer.invoke('setChildWindowShow', config)
},
// 隐藏主窗口
mainWindowHide: () => { mainWindowHide: () => {
ipcRenderer.invoke('mainWindowHide') ipcRenderer.invoke('mainWindowHide')
}, },

View File

@ -78,10 +78,9 @@ const NoticeWindow: React.FC = () => {
time = setInterval(() => { time = setInterval(() => {
const dom = document.getElementsByClassName('ant-notification') const dom = document.getElementsByClassName('ant-notification')
if (dom.length === 0) { if (dom.length === 0) {
window.electron.setChildWindow({ window.electron.setChildWindowShow({
height: 1,
width: 1,
key: 'noticeWindow', key: 'noticeWindow',
bool: false
}) })
} }
}, 1000) }, 1000)

View File

@ -660,17 +660,14 @@ const Meeting: React.FC = () => {
case 'ApplyToSpeak': case 'ApplyToSpeak':
setIsScreenCapture(bool => { setIsScreenCapture(bool => {
if (bool) { if (bool) {
window.electron.setChildWindow({ window.electron.setChildWindowShow({
width: 388,
height: 150,
key: 'noticeWindow', key: 'noticeWindow',
bool: true
}) })
setTimeout(() => { channel.postMessage({
channel.postMessage({ type: 'noticeItem',
type: 'noticeItem', noticeItem: item
noticeItem: item });
});
}, 1000)
} else { } else {
api.open({ api.open({
message: '', message: '',

1
src/render.d.ts vendored
View File

@ -22,6 +22,7 @@ export interface IElectronAPI {
getRegistry: () => any; getRegistry: () => any;
createChildWindow: (config: any) => void; createChildWindow: (config: any) => void;
setChildWindow: (config: any) => void; setChildWindow: (config: any) => void;
setChildWindowShow: (config: any) => void;
closeChildWindow: (key: string) => void; closeChildWindow: (key: string) => void;
mainWindowCenter: () => any; mainWindowCenter: () => any;
mainWindowHide: () => any; mainWindowHide: () => any;