From 89244932c6185cd39e9a9f8aa8bf3acf99329335 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 11 四月 2021 15:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/dialog/devicePlayer.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 2c5aa57..30de142 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -136,7 +136,7 @@
</template>
<script>
-import player from '../dialog/player.vue'
+import player from '../dialog/rtcPlayer.vue'
export default {
name: 'devicePlayer',
props: {},
@@ -250,7 +250,7 @@
this.hasaudio = hasAudio;
this.isLoging = false;
- this.videoUrl = streamInfo.ws_flv;
+ this.videoUrl = streamInfo.rtc;
this.streamId = streamInfo.streamId;
this.app = streamInfo.app;
this.playFromStreamInfo(false, streamInfo)
--
Gitblit v1.8.0