From f223aad70516049577c261d5e6cd876abed07cb4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 18 十一月 2022 18:39:44 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/dialog/devicePlayer.vue | 135 ++++++++++++++++++++++++++------------------
1 files changed, 79 insertions(+), 56 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 2d3818a..6e7466e 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,89 +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.rtmp">
+ <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.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>
@@ -307,7 +310,7 @@
name: 'devicePlayer',
props: {},
components: {
- jessibucaPlayer, rtcPlayer, recordDownload,
+ LivePlayer, jessibucaPlayer, rtcPlayer, recordDownload,
},
computed: {
getPlayerShared: function () {
@@ -319,7 +322,9 @@
}
},
created() {
+ console.log("created")
console.log(this.player)
+ this.broadcastStatus = -1;
if (Object.keys(this.player).length === 1) {
this.activePlayer = Object.keys(this.player)[0]
}
@@ -332,7 +337,7 @@
// 濡備綍浣犲彧鏄敤涓�绉嶆挱鏀惧櫒锛岀洿鎺ユ敞閲婃帀涓嶇敤鐨勯儴鍒嗗嵆鍙�
player: {
jessibuca : ["ws_flv", "wss_flv"],
- webRTC: ["rtc", "rtc"],
+ webRTC: ["rtc", "rtcs"],
},
videoHistory: {
date: '',
@@ -405,10 +410,13 @@
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) {
+ if (this.showVideoDialog) {
+ return;
+ }
this.tabActiveName = tab;
this.channelId = channelId;
this.deviceId = deviceId;
@@ -455,9 +463,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;
@@ -540,9 +548,7 @@
this.stopPlayRecord();
}
this.recordPlay = ''
- if (this.broadcastStatus === 1) {
- this.stopBroadcast()
- }
+ this.stopBroadcast()
},
copySharedInfo: function (data) {
@@ -857,7 +863,12 @@
}).then( (res)=> {
if (res.data.code == 0) {
let streamInfo = res.data.data.streamInfo;
- this.startBroadcast(streamInfo.rtc)
+ if (document.location.protocol.includes("https")) {
+ this.startBroadcast(streamInfo.rtcs)
+ }else {
+ this.startBroadcast(streamInfo.rtc)
+ }
+
}else {
this.$message({
showClose: true,
@@ -867,7 +878,8 @@
}
});
}else if (this.broadcastStatus === 1) {
- this.stopBroadcast()
+ this.broadcastStatus = -1;
+ this.broadcastRtc.close()
}
},
startBroadcast(url){
@@ -882,6 +894,7 @@
message: "鑾峰彇鎺ㄦ祦閴存潈Key澶辫触",
type: "error",
});
+ this.broadcastStatus = -1;
}else {
let pushKey = res.data.data.pushKey;
// 鑾峰彇鎺ㄦ祦閴存潈KEY
@@ -915,6 +928,7 @@
message: '涓嶆敮鎸亀ebrtc, 鏃犳硶杩涜璇煶瀵硅',
type: 'error'
});
+ this.broadcastStatus = -1;
});
this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR,(e)=>{// ICE 鍗忓晢鍑洪敊
@@ -924,6 +938,7 @@
message: 'ICE 鍗忓晢鍑洪敊',
type: 'error'
});
+ this.broadcastStatus = -1;
});
this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED,(e)=>{// offer anwser 浜ゆ崲澶辫触
@@ -933,6 +948,7 @@
message: 'offer anwser 浜ゆ崲澶辫触' + e,
type: 'error'
});
+ this.broadcastStatus = -1;
});
this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ON_CONNECTION_STATE_CHANGE,(e)=>{// offer anwser 浜ゆ崲澶辫触
console.log('鐘舵�佹敼鍙�',e)
@@ -951,15 +967,23 @@
message: '鎹曡幏娴佸け璐�' + e,
type: 'error'
});
+ this.broadcastStatus = -1;
});
}
+ }).catch((e) => {
+ this.$message({
+ showClose: true,
+ message: e,
+ type: 'error'
+ });
+ this.broadcastStatus = -1;
});
},
stopBroadcast(){
- this.broadcastStatus = -2;
- this.broadcastRtc = null;
+ this.broadcastRtc.close();
+ this.broadcastStatus = -1;
this.$axios({
method: 'get',
url: '/api/play/broadcast/stop/' + this.deviceId + '/' + this.channelId
@@ -975,7 +999,6 @@
});
}
});
-
}
}
};
--
Gitblit v1.8.0