From beb94a8ebadb51d9067a1f26c01b8ef7ca0c8853 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Tue, 27 Aug 2024 14:59:33 +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/page/Home/Index/index.tsx | 39 +++++++++++++++++++++--------------
 src/utils/package/agora.ts    | 23 ++++++++++++++-------
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx
index 12f72fc..e9ad553 100644
--- a/src/page/Home/Index/index.tsx
+++ b/src/page/Home/Index/index.tsx
@@ -79,6 +79,14 @@ const Index: React.FC = () => {
       }
     })
   }
+  const postRefresh = async (callBack: Function): Promise<void> => {
+    await PostRefresh(user.refresh_token).then(res => {
+      if (res.code === 200) {
+        storage.setItem('user', JSON.stringify(res.data))
+        callBack(res.data)
+      }
+    })
+  }
   return (
     <>
       <div className={styles.index}>
@@ -147,21 +155,22 @@ const Index: React.FC = () => {
                           if (userInfo.roleId === '1') {
                             joinSettingRef.current.changeModal(item.roomNum)
                           } else {
-                            await PostRefresh(userInfo.refresh_token)
-                            getRoomRtcToken(item.roomNum, (options: any) => {
-                              if (options) {
-                                navigate(`/meeting`, {
-                                  state: {
-                                    channelId: item.roomNum,
-                                    token: options.token,
-                                    tokenA: options.tokenA,
-                                    roomId: item.id,
-                                    roomName: item.roomName,
-                                    enableMicr: false,
-                                    enableCamera: false,
-                                  }
-                                })
-                              }
+                            postRefresh(() => {
+                              getRoomRtcToken(item.roomNum, (options: any) => {
+                                if (options) {
+                                  navigate(`/meeting`, {
+                                    state: {
+                                      channelId: item.roomNum,
+                                      token: options.token,
+                                      tokenA: options.tokenA,
+                                      roomId: item.id,
+                                      roomName: item.roomName,
+                                      enableMicr: false,
+                                      enableCamera: false,
+                                    }
+                                  })
+                                }
+                              })
                             })
                           }
                         }}
diff --git a/src/utils/package/agora.ts b/src/utils/package/agora.ts
index 824cf22..f5e733d 100644
--- a/src/utils/package/agora.ts
+++ b/src/utils/package/agora.ts
@@ -223,15 +223,22 @@ const agora = {
     await rtcEngine.joinChannelEx(
       option.tokenA,
       { channelId: option.channelId + '1', localUid: Number('1' + option.screenShareId) },
-      {
-        autoSubscribeAudio: false,//设置是否自动订阅所有音频流
-        autoSubscribeVideo: false,//设置是否自动订阅所有视频流
-        publishMicrophoneTrack: false,//设置是否发布麦克风采集到的音频
-        publishCameraTrack: true,//设置是否发布摄像头采集的视频
-        clientRoleType: ClientRoleType.ClientRoleAudience,//用户角色  ClientRoleBroadcaster 主播  ClientRoleAudience 观众
-        publishScreenTrack: false,//设置是否发布屏幕采集的视频
-      }
+      {}
     );
+    await agora.updateChannelMediaOptionsEx(false)
+  },
+  updateChannelMediaOptionsEx: async (bool: boolean) => {
+    rtcEngine.updateChannelMediaOptionsEx({
+      clientRoleType: bool ? ClientRoleType.ClientRoleBroadcaster : ClientRoleType.ClientRoleAudience,  //用户角色  ClientRoleBroadcaster 主播  ClientRoleAudience 观众
+      autoSubscribeAudio: true,//设置是否自动订阅所有音频流
+      autoSubscribeVideo: true,//设置是否自动订阅所有视频流
+      publishMicrophoneTrack: true,//设置是否发布麦克风采集到的音频
+      publishCameraTrack: true,//设置是否发布摄像头采集的视频
+      publishScreenTrack: false,//设置是否发布屏幕采集的视频
+    }, {
+      channelId: option.channelId + '1',
+      localUid: Number('1' + option.screenShareId)
+    })
   },
   // 离开共享屏幕频道
   leaveChannelEx: async (uid: any) => {