diff --git a/main.js b/main.js index ba98a0a..1186731 100644 --- a/main.js +++ b/main.js @@ -125,6 +125,10 @@ app.on('session-created', (session) => { mainWindow.focus(); } }) +// 退出房间 +app.on('will-quit', async (event) => { + await mainWindow.webContents.send('quitAndInstall'); +}); app.on('ready', () => { const env = process.argv.find((arg) => arg.startsWith('--env='))?.split('=')[1]; diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 8b8fee2..e7a78c5 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -342,7 +342,6 @@ const Meeting: React.FC = () => { if (String(res.data).length === 9) { // 共享屏幕 setCurrentLookUserStatus(2) - setCurrentVideoId('2') setTimeout(() => { agora.setupLocalVideo({ uid: Number(res.data), @@ -353,7 +352,6 @@ const Meeting: React.FC = () => { }, 1000); } else { setCurrentLookUserStatus(1) - setCurrentVideoId('1') // 摄像头 setTimeout(() => { agora.setupLocalVideo({ @@ -368,7 +366,6 @@ const Meeting: React.FC = () => { if (String(res.data).length === 9) { // 摄像头 setCurrentLookUserStatus(3) - setCurrentVideoId('3') setTimeout(() => { agora.setupRemoteVideoJoin({ uid: Number(res.data), @@ -379,7 +376,6 @@ const Meeting: React.FC = () => { } else { // 共享屏幕 setCurrentLookUserStatus(4) - setCurrentVideoId('4') setTimeout(() => { agora.setupRemoteVideoJoin({ uid: Number(res.data), @@ -714,14 +710,12 @@ const Meeting: React.FC = () => { return '' } // 设置单个视频样式 - const setMeetingContentSwiperCardClass = (uid: string): string => { - if ((currentVideoId === uid) && (meetingMode === 'StandardMode' || meetingMode === 'SpeakerMode')) { - switch (meetingMode) { - case 'StandardMode': - return styles.meetingContentSwiperCardStandardMode - case 'SpeakerMode': - return styles.meetingContentSwiperCardSpeakerMode - } + const setMeetingContentSwiperCardClass = (): string => { + switch (meetingMode) { + case 'StandardMode': + return styles.meetingContentSwiperCardStandardMode + case 'SpeakerMode': + return styles.meetingContentSwiperCardSpeakerMode } return '' } @@ -782,7 +776,7 @@ const Meeting: React.FC = () => { return ( item.isRoom ?
{ setCurrentVideoId(item.uid) @@ -800,7 +794,7 @@ const Meeting: React.FC = () => { } )} {currentLookUserStatus === 1 && currentLookUserAccount ? -
setCurrentVideoId('1')}> +
{
@@ -810,7 +804,7 @@ const Meeting: React.FC = () => { {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
: null} {currentLookUserStatus === 2 && currentLookUserAccount ? -
setCurrentVideoId('2')}> +
@@ -820,7 +814,7 @@ const Meeting: React.FC = () => { {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
: null} {currentLookUserStatus === 3 && currentLookUserAccount ? -
setCurrentVideoId('3')}> +
@@ -830,7 +824,7 @@ const Meeting: React.FC = () => { {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
: null} {currentLookUserStatus === 4 && currentLookUserAccount ? -
setCurrentVideoId('4')}> +