From 29b06d790357c7ae0f3a776c84943155079bda84 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 16 Oct 2024 17:57:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JoinSetting/index.tsx | 18 ++++++++++++------
 src/page/Meeting/index.tsx           |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/JoinSetting/index.tsx b/src/components/JoinSetting/index.tsx
index 6a11b2a..fe0cffb 100644
--- a/src/components/JoinSetting/index.tsx
+++ b/src/components/JoinSetting/index.tsx
@@ -12,20 +12,26 @@ import { role } from '@/config/role';
 let time = null as any;
 const JoinSetting = forwardRef((_props: any, ref: any) => {
   useImperativeHandle(ref, () => ({
-    changeModal: (roomNum: string = '') => {
+    changeModal: async (roomNum: string = '') => {
       let userInfo = JSON.parse(storage.getItem('user') as string)
       setUser(userInfo)
       setJoinRoomSettingModal(true)
+      if (location.hash.indexOf('/meeting') === -1) {
+        await agora.init()
+      }
       setJoinRoomSettingForm((res: any) => {
-        res.forEach((item: any) => {
-          item.active = false
+        res.forEach((item: any, index: number) => {
+          if (index === 0) {
+            agora.getAudioMediaList().then(res => {
+              item.active = res.ecordingList.length ? true : false
+            })
+          } else {
+            item.active = false
+          }
         });
         return res
       })
       setRoomNumber(roomNum)
-      if (location.hash.indexOf('/meeting') === -1) {
-        agora.init()
-      }
       getDeviceList()
     }
   }))
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index e87ab5e..c8bd9e8 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -595,7 +595,7 @@ const Meeting: React.FC = () => {
                 message.success(`操作成功`)
                 await agora.updateChannelMediaOptions(item.user.isRoomManager)
                 await postOpenMicrApi(item.user.isRoomManager, userInfo.uid, false)
-                await postOpenCameraApi(item.user.isRoomManager, userInfo.uid)
+                await postOpenCameraApi(false, userInfo.uid) // 不管身份如何改变都关闭摄像头
                 await stopScreenCapture()
               } else {
                 message.success(`${item.user.userName}已结束发言`)