yangjie #28

Merged
yangqiang merged 32 commits from yangjie into master 2024-10-29 15:15:48 +08:00
3 changed files with 4 additions and 2 deletions
Showing only changes of commit d925cdb74d - Show all commits

View File

@ -282,7 +282,7 @@ app.on('ready', () => {
}) })
}); });
// 用户退出频道回调 // 用户退出频道回调
connection.on("UserLeave", (uid,) => { connection.on("UserLeave", (uid) => {
mainWindow.webContents.send('onSignalr', { mainWindow.webContents.send('onSignalr', {
key: 'UserLeave', key: 'UserLeave',
uid, uid,

View File

@ -18,9 +18,11 @@ window.electron = {
ipcRenderer.on('changeLocalStorage', callback) ipcRenderer.on('changeLocalStorage', callback)
}, },
onOtherSignalr: (callback) => { onOtherSignalr: (callback) => {
ipcRenderer.invoke('onOtherSignalr')
ipcRenderer.on('onOtherSignalr', callback) ipcRenderer.on('onOtherSignalr', callback)
}, },
onSignalr: (callback) => { onSignalr: (callback) => {
ipcRenderer.invoke('onSignalr')
ipcRenderer.on('onSignalr', callback) ipcRenderer.on('onSignalr', callback)
}, },
// 设置窗口大小 // 设置窗口大小

View File

@ -533,7 +533,7 @@ const Meeting: React.FC = () => {
}, [currentVideoId, isShare]); }, [currentVideoId, isShare]);
useEffect(() => { useEffect(() => {
window.electron.onSignalr(async (item: any) => { window.electron.onSignalr(async (_e: any, item: any) => {
const setting = JSON.parse(storage.getItem('setting') as string) const setting = JSON.parse(storage.getItem('setting') as string)
switch (item.key) { switch (item.key) {
// 聊天 // 聊天