From 12fa3b4c8da2af13a710400d64c9fe6d5d6b1e5e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 23 十一月 2022 09:57:17 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/dialog/devicePlayer.vue | 101 ++++++++++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 52 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 4c8f264..228909f 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -2,7 +2,6 @@
<div id="devicePlayer" v-loading="isLoging">
<el-dialog title="瑙嗛鎾斁" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()">
- <!-- <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasaudio" fluent autoplay live></LivePlayer> -->
<div style="width: 100%; height: 100%">
<el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1">
<el-tab-pane label="Jessibuca" name="jessibuca">
@@ -51,93 +50,93 @@
鏇村鍦板潃<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown" >
- <el-dropdown-item :command="streamInfo.flv">
+ <el-dropdown-item :command="streamInfo.flv.url">
<el-tag >FLV:</el-tag>
- <span>{{ streamInfo.flv }}</span>
+ <span>{{ streamInfo.flv.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.https_flv">
+ <el-dropdown-item :command="streamInfo.https_flv.url">
<el-tag >FLV(https):</el-tag>
- <span>{{ streamInfo.https_flv }}</span>
+ <span>{{ streamInfo.https_flv.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.ws_flv">
+ <el-dropdown-item :command="streamInfo.ws_flv.url">
<el-tag >FLV(ws):</el-tag>
- <span >{{ streamInfo.ws_flv }}</span>
+ <span >{{ streamInfo.ws_flv.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.wss_flv">
+ <el-dropdown-item :command="streamInfo.wss_flv.url">
<el-tag >FLV(wss):</el-tag>
- <span>{{ streamInfo.wss_flv }}</span>
+ <span>{{ streamInfo.wss_flv.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.fmp4">
+ <el-dropdown-item :command="streamInfo.fmp4.url">
<el-tag >FMP4:</el-tag>
- <span>{{ streamInfo.fmp4 }}</span>
+ <span>{{ streamInfo.fmp4.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.https_fmp4">
+ <el-dropdown-item :command="streamInfo.https_fmp4.url">
<el-tag >FMP4(https):</el-tag>
- <span>{{ streamInfo.https_fmp4 }}</span>
+ <span>{{ streamInfo.https_fmp4.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.ws_fmp4">
+ <el-dropdown-item :command="streamInfo.ws_fmp4.url">
<el-tag >FMP4(ws):</el-tag>
- <span>{{ streamInfo.ws_fmp4 }}</span>
+ <span>{{ streamInfo.ws_fmp4.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.wss_fmp4">
+ <el-dropdown-item :command="streamInfo.wss_fmp4.url">
<el-tag >FMP4(wss):</el-tag>
- <span>{{ streamInfo.wss_fmp4 }}</span>
+ <span>{{ streamInfo.wss_fmp4.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.hls">
+ <el-dropdown-item :command="streamInfo.hls.url">
<el-tag>HLS:</el-tag>
- <span>{{ streamInfo.hls }}</span>
+ <span>{{ streamInfo.hls.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.https_hls">
+ <el-dropdown-item :command="streamInfo.https_hls.url">
<el-tag >HLS(https):</el-tag>
- <span>{{ streamInfo.https_hls }}</span>
+ <span>{{ streamInfo.https_hls.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.ws_hls">
+ <el-dropdown-item :command="streamInfo.ws_hls.url">
<el-tag >HLS(ws):</el-tag>
- <span>{{ streamInfo.ws_hls }}</span>
+ <span>{{ streamInfo.ws_hls.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.wss_hls">
+ <el-dropdown-item :command="streamInfo.wss_hls.url">
<el-tag >HLS(wss):</el-tag>
- <span>{{ streamInfo.wss_hls }}</span>
+ <span>{{ streamInfo.wss_hls.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.ts">
+ <el-dropdown-item :command="streamInfo.ts.url">
<el-tag>TS:</el-tag>
- <span>{{ streamInfo.ts }}</span>
+ <span>{{ streamInfo.ts.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.https_ts">
+ <el-dropdown-item :command="streamInfo.https_ts.url">
<el-tag>TS(https):</el-tag>
- <span>{{ streamInfo.https_ts }}</span>
+ <span>{{ streamInfo.https_ts.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.ws_ts">
+ <el-dropdown-item :command="streamInfo.ws_ts.url">
<el-tag>TS(ws):</el-tag>
- <span>{{ streamInfo.ws_ts }}</span>
+ <span>{{ streamInfo.ws_ts.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.wss_ts">
+ <el-dropdown-item :command="streamInfo.wss_ts.url">
<el-tag>TS(wss):</el-tag>
- <span>{{ streamInfo.wss_ts }}</span>
+ <span>{{ streamInfo.wss_ts.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.rtc">
+ <el-dropdown-item :command="streamInfo.rtc.url">
<el-tag >RTC:</el-tag>
- <span>{{ streamInfo.rtc }}</span>
+ <span>{{ streamInfo.rtc.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.rtcs">
+ <el-dropdown-item :command="streamInfo.rtcs.url">
<el-tag >RTCS:</el-tag>
<span>{{ streamInfo.rtcs }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.rtmp">
+ <el-dropdown-item :command="streamInfo.rtmp.url">
<el-tag >RTMP:</el-tag>
- <span>{{ streamInfo.rtmp }}</span>
+ <span>{{ streamInfo.rtmp.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.rtmps">
+ <el-dropdown-item :command="streamInfo.rtmps.url">
<el-tag >RTMPS:</el-tag>
- <span>{{ streamInfo.rtmps }}</span>
+ <span>{{ streamInfo.rtmps.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.rtsp">
+ <el-dropdown-item :command="streamInfo.rtsp.url">
<el-tag >RTSP:</el-tag>
- <span>{{ streamInfo.rtsp }}</span>
+ <span>{{ streamInfo.rtsp.url }}</span>
</el-dropdown-item>
- <el-dropdown-item :command="streamInfo.rtsps">
+ <el-dropdown-item :command="streamInfo.rtsps.url">
<el-tag >RTSPS:</el-tag>
- <span>{{ streamInfo.rtsps }}</span>
+ <span>{{ streamInfo.rtsps.url }}</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -303,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: {
- jessibucaPlayer, rtcPlayer, recordDownload,
+ jessibucaPlayer, rtcPlayer, recordDownload,
},
computed: {
getPlayerShared: function () {
@@ -411,7 +408,7 @@
changePlayer: function (tab) {
console.log(this.player[tab.name][0])
this.activePlayer = tab.name;
- this.videoUrl = this.streamInfo[this.player[tab.name][0]]
+ this.videoUrl = this.getUrlByStreamInfo()
console.log(this.videoUrl)
},
openDialog: function (tab, deviceId, channelId, param) {
@@ -464,9 +461,9 @@
getUrlByStreamInfo(){
console.log(this.streamInfo)
if (location.protocol === "https:") {
- this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
+ this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]].url
}else {
- this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]]
+ this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]].url
}
return this.videoUrl;
@@ -865,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