From c35932e24cf9dda9ef396ab5a45fb1a6e5539748 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 29 十月 2021 11:22:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/dialog/devicePlayer.vue | 72 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 11 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 9653833..5d23f35 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -3,7 +3,7 @@
<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> -->
- <player ref="videoPlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :height="false" :hasaudio="hasaudio" fluent autoplay live ></player>
+ <player ref="videoPlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :height="false" :hasAudio="hasAudio" fluent autoplay live ></player>
<div id="shared" style="text-align: right; margin-top: 1rem;">
<el-tabs v-model="tabActiveName" @tab-click="tabHandleClick">
<el-tab-pane label="瀹炴椂瑙嗛" name="media">
@@ -48,7 +48,10 @@
<el-table-column label="鎿嶄綔">
<template slot-scope="scope">
- <el-button icon="el-icon-video-play" size="mini" @click="playRecord(scope.row)">鎾斁</el-button>
+ <el-button-group>
+ <el-button icon="el-icon-video-play" size="mini" @click="playRecord(scope.row)">鎾斁</el-button>
+ <el-button icon="el-icon-download" size="mini" @click="downloadRecord(scope.row)">涓嬭浇</el-button>
+ </el-button-group>
</template>
</el-table-column>
</el-table>
@@ -181,11 +184,12 @@
showVideoDialog: false,
streamId: '',
app : '',
+ mediaServerId : '',
convertKey: '',
deviceId: '',
channelId: '',
tabActiveName: 'media',
- hasaudio: false,
+ hasAudio: false,
loadingRecords: false,
recordsLoading: false,
isLoging: false,
@@ -218,7 +222,7 @@
if (tab.name == "codec") {
this.$axios({
method: 'get',
- url: '/zlm/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId
+ url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId
}).then(function (res) {
that.tracksLoading = false;
if (res.data.code == 0 && res.data.online) {
@@ -239,6 +243,7 @@
this.channelId = channelId;
this.deviceId = deviceId;
this.streamId = "";
+ this.mediaServerId = "";
this.app = "";
this.videoUrl = ""
if (!!this.$refs.videoPlayer) {
@@ -255,8 +260,8 @@
break;
case "streamPlay":
this.tabActiveName = "media";
- this.showRrecord = false,
- this.showPtz = false,
+ this.showRrecord = false;
+ this.showPtz = false;
this.play(param.streamInfo, param.hasAudio)
break;
case "control":
@@ -267,22 +272,34 @@
console.log(val)
},
play: function (streamInfo, hasAudio) {
-
- this.hasaudio = hasAudio;
+ this.hasAudio = hasAudio;
this.isLoging = false;
// this.videoUrl = streamInfo.rtc;
this.videoUrl = this.getUrlByStreamInfo(streamInfo);
this.streamId = streamInfo.streamId;
this.app = streamInfo.app;
+ this.mediaServerId = streamInfo.mediaServerId;
this.playFromStreamInfo(false, streamInfo)
},
getUrlByStreamInfo(streamInfo){
let baseZlmApi = process.env.NODE_ENV === 'development'?`${location.host}/debug/zlm`:`${location.host}/zlm`
- console.log(12121212)
- console.log(baseZlmApi)
// return `${baseZlmApi}/${streamInfo.app}/${streamInfo.streamId}.flv`;
// return `http://${baseZlmApi}/${streamInfo.app}/${streamInfo.streamId}.flv`;
- return streamInfo.ws_flv;
+ if (location.protocol === "https:") {
+ if (streamInfo.wss_flv === null) {
+ this.$message({
+ showClose: true,
+ message: '濯掍綋鏈嶅姟鍣ㄦ湭閰嶇疆ssl绔彛',
+ type: 'error'
+ });
+ }else {
+ return streamInfo.wss_flv;
+ }
+
+ }else {
+ return streamInfo.ws_flv;
+ }
+
},
coverPlay: function () {
var that = this;
@@ -428,6 +445,7 @@
var streamInfo = res.data;
that.app = streamInfo.app;
that.streamId = streamInfo.streamId;
+ that.mediaServerId = streamInfo.mediaServerId;
that.videoUrl = that.getUrlByStreamInfo(streamInfo);
that.recordPlay = true;
});
@@ -443,6 +461,38 @@
if (callback) callback()
});
},
+ downloadRecord: function (row) {
+ let that = this;
+ if (that.streamId != "") {
+ that.stopDownloadRecord(function () {
+ that.streamId = "",
+ that.downloadRecord(row);
+ })
+ } else {
+ this.$axios({
+ method: 'get',
+ url: '/api/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
+ row.endTime + '&downloadSpeed=4'
+ }).then(function (res) {
+ var streamInfo = res.data;
+ that.app = streamInfo.app;
+ that.streamId = streamInfo.streamId;
+ that.mediaServerId = streamInfo.mediaServerId;
+ that.videoUrl = that.getUrlByStreamInfo(streamInfo);
+ that.recordPlay = true;
+ });
+ }
+ },
+ stopDownloadRecord: function (callback) {
+ this.$refs.videoPlayer.pause();
+ this.videoUrl = '';
+ this.$axios({
+ method: 'get',
+ url: '/api/download/stop/' + this.deviceId + "/" + this.channelId
+ }).then(function (res) {
+ if (callback) callback()
+ });
+ },
ptzCamera: function (leftRight, upDown, zoom) {
console.log('浜戝彴鎺у埗锛�' + leftRight + ' : ' + upDown + " : " + zoom);
let that = this;
--
Gitblit v1.8.0