From b64d701f37a9f4c0e444ca41a92bfb24ba89ff84 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 19 十月 2022 10:07:47 +0800
Subject: [PATCH] 隐藏liveplayer
---
web_src/src/components/dialog/devicePlayer.vue | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 19b66a1..7e62ef7 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -2,9 +2,11 @@
<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="border-card" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1">
+ <el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1">
+ <el-tab-pane label="LivePlayer" name="livePlayer">
+ <LivePlayer v-if="showVideoDialog" ref="livePlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasAudio" fluent autoplay live></LivePlayer>
+ </el-tab-pane>
<el-tab-pane label="Jessibuca" name="jessibuca">
<jessibucaPlayer v-if="activePlayer === 'jessibuca'" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer>
</el-tab-pane>
@@ -286,7 +288,7 @@
<script>
import rtcPlayer from '../dialog/rtcPlayer.vue'
-// import LivePlayer from '@liveqing/liveplayer'
+import LivePlayer from '@liveqing/liveplayer'
// import player from '../dialog/easyPlayer.vue'
import jessibucaPlayer from '../common/jessibuca.vue'
import recordDownload from '../dialog/recordDownload.vue'
@@ -294,7 +296,7 @@
name: 'devicePlayer',
props: {},
components: {
- jessibucaPlayer, rtcPlayer, recordDownload,
+ LivePlayer, jessibucaPlayer, rtcPlayer, recordDownload,
},
computed: {
getPlayerShared: function () {
@@ -315,10 +317,11 @@
return {
video: 'http://lndxyj.iqilu.com/public/upload/2019/10/14/8c001ea0c09cdc59a57829dabc8010fa.mp4',
videoUrl: '',
- activePlayer: "jessibuca",
+ activePlayer: "livePlayer",
// 濡備綍浣犲彧鏄敤涓�绉嶆挱鏀惧櫒锛岀洿鎺ユ敞閲婃帀涓嶇敤鐨勯儴鍒嗗嵆鍙�
player: {
jessibuca : ["ws_flv", "wss_flv"],
+ // livePlayer : ["ws_flv", "wss_flv"],
webRTC: ["rtc", "rtc"],
},
videoHistory: {
@@ -371,10 +374,10 @@
if (tab.name === "codec") {
this.$axios({
method: 'get',
- url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId
+ url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtsp&app='+ this.app +'&stream='+ this.streamId
}).then(function (res) {
that.tracksLoading = false;
- if (res.data.code == 0 && res.data.online) {
+ if (res.data.code == 0 && res.data.tracks) {
that.tracks = res.data.tracks;
}else{
that.tracksNotLoaded = true;
@@ -394,6 +397,9 @@
console.log(this.videoUrl)
},
openDialog: function (tab, deviceId, channelId, param) {
+ if (this.showVideoDialog) {
+ return;
+ }
this.tabActiveName = tab;
this.channelId = channelId;
this.deviceId = deviceId;
@@ -438,6 +444,7 @@
this.playFromStreamInfo(false, streamInfo)
},
getUrlByStreamInfo(){
+ console.log(this.streamInfo)
if (location.protocol === "https:") {
this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
}else {
@@ -452,9 +459,9 @@
this.$refs[this.activePlayer].pause()
that.$axios({
method: 'post',
- url: '/api/gb_record/convert/' + that.streamId
+ url: '/api/play/convert/' + that.streamId
}).then(function (res) {
- if (res.data.code == 0) {
+ if (res.data.code === 0) {
that.convertKey = res.data.key;
setTimeout(()=>{
that.isLoging = false;
@@ -563,10 +570,10 @@
url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
}).then(function (res) {
console.log(res)
+ that.recordsLoading = false;
if(res.data.code === 0) {
// 澶勭悊鏃堕棿淇℃伅
that.videoHistory.searchHistoryResult = res.data.data.recordList;
- that.recordsLoading = false;
}else {
this.$message({
showClose: true,
@@ -605,13 +612,21 @@
url: '/api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
row.endTime
}).then(function (res) {
- var streamInfo = res.data;
- that.app = streamInfo.app;
- that.streamId = streamInfo.stream;
- that.mediaServerId = streamInfo.mediaServerId;
- that.ssrc = streamInfo.ssrc;
- that.videoUrl = that.getUrlByStreamInfo(streamInfo);
- that.recordPlay = true;
+ if (res.data.code === 0) {
+ that.streamInfo = res.data.data;
+ that.app = that.streamInfo.app;
+ that.streamId = that.streamInfo.stream;
+ that.mediaServerId = that.streamInfo.mediaServerId;
+ that.ssrc = that.streamInfo.ssrc;
+ that.videoUrl = that.getUrlByStreamInfo();
+ }else {
+ that.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+ that.recordPlay = true;
});
}
},
--
Gitblit v1.8.0