From c61f3b735a9e16455df1d84e5ed29436215b460c Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Thu, 8 Aug 2024 17:55:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9=E5=87=BB=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E8=A7=86=E9=A2=91=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                    |  4 ++++
 src/page/Meeting/index.tsx | 28 +++++++++++-----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

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 ?
                       <div
-                        className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass(item.uid)}`}
+                        className={`${styles.meetingContentSwiperCard}`}
                         key={index}
                         onClick={() => {
                           setCurrentVideoId(item.uid)
@@ -800,7 +794,7 @@ const Meeting: React.FC = () => {
                 }
                 )}
                 {currentLookUserStatus === 1 && currentLookUserAccount ?
-                  <div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass('1')}`} onClick={() => setCurrentVideoId('1')}>
+                  <div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass()}`}>
                     <div className={`${styles.meetingContentSwiperCardVdeio}`} id='video-source-camera-primary'>
                       {<div className={styles.meetingContentSwiperCardVdeioLoading}>
                         <Avatar name={currentLookUserAccount.userName} />
@@ -810,7 +804,7 @@ const Meeting: React.FC = () => {
                     {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
                   </div> : null}
                 {currentLookUserStatus === 2 && currentLookUserAccount ?
-                  <div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass('2')}`} onClick={() => setCurrentVideoId('2')}>
+                  <div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass()}`}>
                     <div className={`${styles.meetingContentSwiperCardVdeio}`} id='video-source-screen'>
                       <div className={styles.meetingContentSwiperCardVdeioLoading}>
                         <Avatar name={currentLookUserAccount.userName} />
@@ -820,7 +814,7 @@ const Meeting: React.FC = () => {
                     {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
                   </div> : null}
                 {currentLookUserStatus === 3 && currentLookUserAccount ?
-                  <div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass('3')}`} onClick={() => setCurrentVideoId('3')}>
+                  <div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass()}`}>
                     <div className={`${styles.meetingContentSwiperCardVdeio}`} id='video-source-remote-camera'>
                       <div className={styles.meetingContentSwiperCardVdeioLoading}>
                         <Avatar name={currentLookUserAccount.userName} />
@@ -830,7 +824,7 @@ const Meeting: React.FC = () => {
                     {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
                   </div> : null}
                 {currentLookUserStatus === 4 && currentLookUserAccount ?
-                  <div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass('4')}`} onClick={() => setCurrentVideoId('4')}>
+                  <div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass()}`}>
                     <div className={`${styles.meetingContentSwiperCardVdeio}`} id='video-source-remote-screen'>
                       <div className={styles.meetingContentSwiperCardVdeioLoading}>
                         <Avatar name={currentLookUserAccount.userName} />