From 91f3ea7c46e293986357f6e7b8d172f64c04ca52 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 2 Apr 2023 22:43:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=9A=E8=AE=AE=E5=9B=9E=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/pages/manage/components/MeetingManager.vue | 15 +++++++--------
 .../js/pages/manage/components/MeetingPlayer.vue  | 12 +++---------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/MeetingManager.vue b/resources/assets/js/pages/manage/components/MeetingManager.vue
index fd611da8c..4123de1e2 100644
--- a/resources/assets/js/pages/manage/components/MeetingManager.vue
+++ b/resources/assets/js/pages/manage/components/MeetingManager.vue
@@ -225,14 +225,13 @@ export default {
                         delete data.name;
                         delete data.msgs;
                         //
-                        $A.loadScript('js/AgoraRTC_N-4.17.0.js', e => {
-                            if (e !== null || typeof AgoraRTC !== 'object') {
-                                $A.modalError("会议组件加载失败！");
-                            } else {
-                                this.join(data)
-                            }
+                        $A.loadScript('js/AgoraRTC_N-4.17.0.js').then(_ => {
+                            this.join(data)
+                        }).catch(_ => {
+                            $A.modalError("会议组件加载失败！");
+                        }).finally(_ => {
                             this.loadIng--;
-                        });
+                        })
                     }).catch(({msg}) => {
                         this.loadIng--;
                         $A.modalError(msg);
@@ -323,7 +322,7 @@ export default {
             }
             // 音频或视频轨道自动播放失败回调
             AgoraRTC.onAutoplayFailed = () => {
-                //
+                $A.messageWarning("点击屏幕开始会议");
             }
 
             // 创建客户端
diff --git a/resources/assets/js/pages/manage/components/MeetingPlayer.vue b/resources/assets/js/pages/manage/components/MeetingPlayer.vue
index 994466230..f69217654 100644
--- a/resources/assets/js/pages/manage/components/MeetingPlayer.vue
+++ b/resources/assets/js/pages/manage/components/MeetingPlayer.vue
@@ -75,19 +75,13 @@ export default {
     watch: {
         audio: {
             handler(b) {
-                if (this.isLocal || !b) {
-                    return
-                }
-                this.play('audio')
+                b && this.play('audio')
             },
             immediate: true
         },
         video: {
             handler(b) {
-                if (!b) {
-                    return
-                }
-                this.play('video')
+                b && this.play('video')
             },
             immediate: true
         }
@@ -97,7 +91,7 @@ export default {
             this.$nextTick(_ => {
                 try {
                     if (type === 'audio') {
-                        this.player.audioTrack.play();
+                        !this.isLocal && this.player.audioTrack.play();
                     } else if (type === 'video') {
                         this.player.videoTrack.play(this.id);
                     }