From ecf84bb0f1952c4a044ff6c8aa18226b31593f3f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 18 十一月 2022 21:52:02 +0800
Subject: [PATCH] 合并主线
---
web_src/src/components/dialog/devicePlayer.vue | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 6e7466e..228909f 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -302,15 +302,13 @@
<script>
import rtcPlayer from '../dialog/rtcPlayer.vue'
import crypto from 'crypto'
-// import LivePlayer from '@liveqing/liveplayer'
-// import player from '../dialog/easyPlayer.vue'
import jessibucaPlayer from '../common/jessibuca.vue'
import recordDownload from '../dialog/recordDownload.vue'
export default {
name: 'devicePlayer',
props: {},
components: {
- LivePlayer, jessibucaPlayer, rtcPlayer, recordDownload,
+ jessibucaPlayer, rtcPlayer, recordDownload,
},
computed: {
getPlayerShared: function () {
@@ -864,9 +862,9 @@
if (res.data.code == 0) {
let streamInfo = res.data.data.streamInfo;
if (document.location.protocol.includes("https")) {
- this.startBroadcast(streamInfo.rtcs)
+ this.startBroadcast(streamInfo.rtcs.url)
}else {
- this.startBroadcast(streamInfo.rtc)
+ this.startBroadcast(streamInfo.rtc.url)
}
}else {
--
Gitblit v1.8.0