From b042e1b62d5a525a0c7ae1bed3a8f1c4e03fff13 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 17 Jul 2024 14:31:41 +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/utils/package/agora.ts | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/utils/package/agora.ts b/src/utils/package/agora.ts
index af1b6bc..8b79bfe 100644
--- a/src/utils/package/agora.ts
+++ b/src/utils/package/agora.ts
@@ -129,29 +129,15 @@ const agora = {
   },
   // 更新频道信息
   updateChannelMediaOptions: (bool: boolean) => {
-    if (bool) {
-      // 摄像头
-      rtcEngine.updateChannelMediaOptions({
-        channelProfile: ChannelProfileType.ChannelProfileLiveBroadcasting, //设置频道场景为直播场景
-        clientRoleType: ClientRoleType.ClientRoleBroadcaster, //设置用户角色为主播；如果要将用户角色设置为观众，保持默认值即可
-        publishMicrophoneTrack: true, //发布麦克风采集的音频
-        publishCameraTrack: true, //发布摄像头采集的视频
-        publishScreenTrack: false, //设置是否发布屏幕采集的视频
-        autoSubscribeAudio: true, //自动订阅所有音频流
-        autoSubscribeVideo: true, //自动订阅所有视频流
-      })
-    } else {
-      // 屏幕
-      rtcEngine.updateChannelMediaOptions({
-        channelProfile: ChannelProfileType.ChannelProfileLiveBroadcasting, //设置频道场景为直播场景
-        clientRoleType: ClientRoleType.ClientRoleBroadcaster, //用户角色 1主播 2观众
-        publishMicrophoneTrack: true, //设置是否发布麦克风采集到的音频
-        publishCameraTrack: false, //设置是否发布摄像头采集的视频
-        publishScreenTrack: true, //设置是否发布屏幕采集的视频
-        autoSubscribeAudio: true, //设置是否自动订阅所有音频流
-        autoSubscribeVideo: true, //设置是否自动订阅所有视频流
-      })
-    }
+    rtcEngine.updateChannelMediaOptions({
+      channelProfile: ChannelProfileType.ChannelProfileLiveBroadcasting, //设置频道场景为直播场景
+      clientRoleType: ClientRoleType.ClientRoleBroadcaster, //设置用户角色为主播；如果要将用户角色设置为观众，保持默认值即可
+      publishMicrophoneTrack: true, //发布麦克风采集的音频
+      publishCameraTrack: true, //发布摄像头采集的视频
+      publishScreenTrack: true, //设置是否发布屏幕采集的视频
+      autoSubscribeAudio: true, //自动订阅所有音频流
+      autoSubscribeVideo: true, //自动订阅所有视频流
+    })
   },
   // 停止共享屏幕
   stopScreenCapture: () => {
@@ -167,7 +153,7 @@ const agora = {
   },
   // 摄像头采集
   setCameraCapture: (sourceType: number) => {
-    agora.stopScreenCapture()
+    // agora.stopScreenCapture()
     if (sourceType !== option.sourceType) {
       rtcEngine.destroyRendererByConfig(option.sourceType, option.channelId, option.account)
       option.sourceType = sourceType
@@ -193,7 +179,7 @@ const agora = {
   // 共享屏幕采集
   setDesktopCapturerVideo: async (targetSource: any, sourceType: number) => {
     if (sourceType !== option.sourceType) {
-      await rtcEngine.stopCameraCapture(option.sourceType)
+      // await rtcEngine.stopCameraCapture(option.sourceType)
       rtcEngine.destroyRendererByConfig(option.sourceType, option.channelId, option.account)
       option.sourceType = sourceType
       agora.setupLocalVideo({