From 038d360dd4f2dd3c06f5d97dc66ed13fd78de212 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 27 六月 2022 09:38:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rtc' into commercial
---
web_src/src/components/dialog/devicePlayer.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 74c14c8..a98656a 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -179,10 +179,10 @@
</template>
<script>
-// import player from '../dialog/rtcPlayer.vue'
+import player from '../dialog/rtcPlayer.vue'
// import LivePlayer from '@liveqing/liveplayer'
// import player from '../dialog/easyPlayer.vue'
-import player from '../dialog/jessibuca.vue'
+// import player from '../dialog/jessibuca.vue'
export default {
name: 'devicePlayer',
props: {},
@@ -305,8 +305,8 @@
play: function (streamInfo, hasAudio) {
this.hasAudio = hasAudio;
this.isLoging = false;
- // this.videoUrl = streamInfo.rtc;
- this.videoUrl = this.getUrlByStreamInfo(streamInfo);
+ this.videoUrl = streamInfo.rtc;
+ // this.videoUrl = this.getUrlByStreamInfo(streamInfo);
this.streamId = streamInfo.streamId;
this.app = streamInfo.app;
this.mediaServerId = streamInfo.mediaServerId;
--
Gitblit v1.8.0