From a47a7ccb5475d288e64939fce5a0f35e55a9de53 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期一, 11 一月 2021 09:13:03 +0800
Subject: [PATCH] 修正个别错误
---
web_src/src/components/gb28181/devicePlayer.vue | 249 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 173 insertions(+), 76 deletions(-)
diff --git a/web_src/src/components/gb28181/devicePlayer.vue b/web_src/src/components/gb28181/devicePlayer.vue
index 493f5d5..c99ce79 100644
--- a/web_src/src/components/gb28181/devicePlayer.vue
+++ b/web_src/src/components/gb28181/devicePlayer.vue
@@ -1,9 +1,11 @@
<template>
-<div id="devicePlayer">
+<div id="devicePlayer" v-loading="isLoging">
+
<el-dialog title="瑙嗛鎾斁" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" :destroy-on-close="true" @close="close()">
- <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :hasaudio="hasaudio" fluent autoplay live></LivePlayer>
+ <!-- <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" :hasaudio="hasaudio" fluent autoplay live></player>
<div id="shared" style="text-align: right; margin-top: 1rem;">
- <el-tabs v-model="tabActiveName">
+ <el-tabs v-model="tabActiveName" @tab-click="tabHandleClick">
<el-tab-pane label="瀹炴椂瑙嗛" name="media">
<div style="margin-bottom: 0.5rem;">
<!-- <el-button type="primary" size="small" @click="playRecord(true, '')">鎾斁</el-button>-->
@@ -26,20 +28,6 @@
<!--{"code":0,"data":{"paths":["22-29-30.mp4"],"rootPath":"/home/kkkkk/Documents/ZLMediaKit/release/linux/Debug/www/record/hls/kkkkk/2020-05-11/"}}-->
<el-tab-pane label="褰曞儚鏌ヨ" name="record">
<el-date-picker size="mini" v-model="videoHistory.date" type="date" value-format="yyyy-MM-dd" placeholder="鏃ユ湡" @change="queryRecords()"></el-date-picker>
- <!-- <el-slider style="margin: 0 1rem 1rem 1rem;"-->
- <!-- v-model="timeVal"-->
- <!-- :min="timeMin"-->
- <!-- :max="timeMax"-->
- <!-- :step="5"-->
- <!-- :marks="getTimeMakrs()"-->
- <!-- :format-tooltip="formatTooltip">-->
- <!-- </el-slider>-->
- <!-- <range-slider :min="timeMin"-->
- <!-- :max="timeMax"-->
- <!-- :step="5"></range-slider>-->
-
- <!-- <el-date-picker v-model="videoHistory.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="缁撴潫鏃堕棿"-->
- <!-- @change="recordList()"></el-date-picker>-->
<el-table :data="videoHistory.searchHistoryResult" height="150" v-loading="recordsLoading">
<el-table-column label="鍚嶇О" prop="name"></el-table-column>
<el-table-column label="鏂囦欢" prop="filePath"></el-table-column>
@@ -76,9 +64,13 @@
<div class="control-round">
<div class="control-round-inner"><i class="fa fa-pause-circle"></i></div>
</div>
- <div style="position: absolute; left: 7.25rem; top: 1.25rem" @mousedown="ptzCamera(0, 0, 1)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-in" style="font-size: 1.875rem;"></i></div>
- <div style="position: absolute; left: 7.25rem; top: 3.25rem; font-size: 1.875rem;" @mousedown="ptzCamera(0, 0, 2)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-out"></i></div>
+ <div style="position: absolute; left: 7.25rem; top: 1.25rem" @mousedown="ptzCamera(0, 0, 1)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-in control-zoom-btn" style="font-size: 1.875rem;"></i></div>
+ <div style="position: absolute; left: 7.25rem; top: 3.25rem; font-size: 1.875rem;" @mousedown="ptzCamera(0, 0, 2)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-out control-zoom-btn"></i></div>
+ <div class="contro-speed" style="position: absolute; left: 4px; top: 7rem; width: 9rem;">
+ <el-slider v-model="controSpeed" :max="255"></el-slider>
+ </div>
</div>
+
<div class="control-panel">
<el-button-group>
<el-tag style="position :absolute; left: 0rem; top: 0rem; width: 5rem; text-align: center" size="medium" type="info">棰勭疆浣嶇紪鍙�</el-tag>
@@ -111,6 +103,32 @@
</div>
</div>
</el-tab-pane>
+ <el-tab-pane label="缂栫爜淇℃伅" name="codec" v-loading="tracksLoading">
+ <p>
+ 鏃犳硶鎾斁鎴栬�呮病鏈夊０闊�?   璇曚竴璇�
+ <el-button size="mini" type="primary" v-if="!coverPlaying" @click="coverPlay">杞爜鎾斁</el-button>
+ <el-button size="mini" type="danger" v-if="coverPlaying" @click="convertStopClick">鍋滄杞爜</el-button>
+ </p>
+ <div class="trank" >
+ <div v-for="(item, index) in tracks">
+ <span >娴� {{index}}</span>
+ <div class="trankInfo" v-if="item.codec_type == 0">
+ <p>鏍煎紡: {{item.codec_id_name}}</p>
+ <p>绫诲瀷: 瑙嗛</p>
+ <p>鍒嗚鲸鐜�: {{item.width}} x {{item.height}}</p>
+ <p>甯х巼: {{item.fps}}</p>
+ </div>
+ <div class="trankInfo" v-if="item.codec_type == 1">
+ <p>鏍煎紡: {{item.codec_id_name}}</p>
+ <p>绫诲瀷: 闊抽</p>
+ <p>閲囨牱浣嶆暟: {{item.sample_bit}}</p>
+ <p>閲囨牱鐜�: {{item.sample_rate}}</p>
+ </div>
+ </div>
+
+ </div>
+
+ </el-tab-pane>
</el-tabs>
</div>
</el-dialog>
@@ -118,12 +136,12 @@
</template>
<script>
-import LivePlayer from '@liveqing/liveplayer'
+import player from './player.vue'
export default {
name: 'devicePlayer',
props: {},
components: {
- LivePlayer
+ player,
},
computed: {
getPlayerShared: function () {
@@ -143,41 +161,17 @@
date: '',
searchHistoryResult: [] //濯掍綋娴佸巻鍙茶褰曟悳绱㈢粨鏋�
},
- timeMakrs: {
- // 0 : "0:00",
- // // 60 : "1:00",
- // 120 : "2:00",
- // // 180 : "3:00",
- // 240 : "4:00",
- // // 300 : "5:00",
- // 360 : "6:00",
- // // 420 : "7:00",
- // 480 : "8:00",
- // 540 : "9:00",
- 600: "10:00",
- // 660 : "11:00",
- 720: "12:00",
- // 780 : "13:00",
- 840: "14:00",
- // 900 : "15:00",
- 960: "16:00",
- // 1020 : "17:00",
- 1080: "18:00",
- // 1140 : "19:00",
- // 1200 : "20:00",
- // // 1260 : "21:00",
- // 1320 : "22:00",
- // // 1380 : "23:00",
- // 1440 : "24:00"
- },
showVideoDialog: false,
- ssrc: '',
+ streamId: '',
+ convertKey: '',
deviceId: '',
channelId: '',
tabActiveName: 'media',
hasaudio: false,
loadingRecords: false,
recordsLoading: false,
+ isLoging: false,
+ controSpeed: 30,
timeVal: 0,
timeMin: 0,
timeMax: 1440,
@@ -187,19 +181,44 @@
cruisingGroup: 0,
scanSpeed: 100,
scanGroup: 0,
+ tracks: [],
+ coverPlaying:false,
+ tracksLoading: false
};
},
methods: {
+ tabHandleClick: function(tab, event) {
+ console.log(tab)
+ var that = this;
+ that.tracks = [];
+ that.tracksLoading = true;
+ if (tab.name == "codec") {
+ this.$axios({
+ method: 'get',
+ url: '/zlm/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app=rtp&stream='+ this.streamId
+ }).then(function (res) {
+ that.tracksLoading = false;
+ if (res.data.code == 0 && res.data.online) {
+ that.tracks = res.data.tracks;
+ }else{
+ that.$message({
+ showClose: true,
+ message: '鑾峰彇缂栫爜淇℃伅澶辫触,',
+ type: 'warning'
+ });
+ }
+ }).catch(function (e) {});
+ }
+ },
openDialog: function (tab, deviceId, channelId, param) {
this.tabActiveName = tab;
this.channelId = channelId;
this.deviceId = deviceId;
- this.ssrc = "";
+ this.streamId = "";
this.videoUrl = ""
if (!!this.$refs.videoPlayer) {
this.$refs.videoPlayer.pause();
}
-
switch (tab) {
case "media":
this.play(param.streamInfo, param.hasAudio)
@@ -217,36 +236,94 @@
timeAxisSelTime: function (val) {
console.log(val)
},
- getTimeMakrs() {
- return this.timeMakrs;
- },
play: function (streamInfo, hasAudio) {
+
this.hasaudio = hasAudio;
- // 鏍规嵁濯掍綋娴佷俊鎭簩娆″垽鏂�
- if (!!streamInfo.tracks && streamInfo.tracks.length > 0) {
- var realHasAudio = false;
- for (let i = 0; i < streamInfo.tracks.length; i++) {
- if (streamInfo.tracks[i].codec_type == 1 && streamInfo.tracks[i].codec_id_name == "CodecAAC") { // 鍒ゆ柇涓篈AC闊抽
- realHasAudio = true;
- }
- }
- this.hasaudio = realHasAudio && this.hasaudio;
- }
- this.ssrc = streamInfo.ssrc;
- // this.$refs.videoPlayer.hasaudio = hasAudio;
- // this.videoUrl = streamInfo.flv + "?" + new Date().getTime();
+ this.isLoging = false;
this.videoUrl = streamInfo.ws_flv;
- this.showVideoDialog = true;
- console.log(this.ssrc);
+ this.streamId = streamInfo.streamId;
+ this.playFromStreamInfo(false, streamInfo)
+ },
+ coverPlay: function () {
+ var that = this;
+ this.coverPlaying = true;
+ this.$refs.videoPlayer.pause()
+ that.$axios({
+ method: 'post',
+ url: '/api/play/' + that.streamId + '/convert'
+ }).then(function (res) {
+ if (res.data.code == 0) {
+ that.convertKey = res.data.key;
+ setTimeout(()=>{
+ that.isLoging = false;
+ that.playFromStreamInfo(false, res.data.data);
+ }, 2000)
+ } else {
+ that.isLoging = false;
+ that.coverPlaying = false;
+ that.$message({
+ showClose: true,
+ message: '杞爜澶辫触',
+ type: 'error'
+ });
+ }
+ }).catch(function (e) {
+ console.log(e)
+ that.coverPlaying = false;
+ that.$message({
+ showClose: true,
+ message: '鎾斁閿欒',
+ type: 'error'
+ });
+ });
+ },
+ convertStopClick: function() {
+ this.convertStop(()=>{
+ this.$refs.videoPlayer.play(this.videoUrl)
+ });
+ },
+ convertStop: function(callback) {
+ var that = this;
+ that.$refs.videoPlayer.pause()
+ this.$axios({
+ method: 'post',
+ url: '/api/play/convert/stop/' + this.convertKey
+ }).then(function (res) {
+ if (res.data.code == 0) {
+ console.log(res.data.msg)
+ }else {
+ console.error(res.data.msg)
+ }
+ if (callback )callback();
+ }).catch(function (e) {});
+ that.coverPlaying = false;
+ that.convertKey = "";
+ // if (callback )callback();
+ },
+
+ playFromStreamInfo: function (realHasAudio, streamInfo) {
+ this.showVideoDialog = true;
+ this.hasaudio = realHasAudio && this.hasaudio;
+ this.$refs.videoPlayer.play(streamInfo.ws_flv)
},
close: function () {
console.log('鍏抽棴瑙嗛');
- this.$refs.videoPlayer.pause();
+ if (!!this.$refs.videoPlayer){
+ this.$refs.videoPlayer.pause();
+ }
this.videoUrl = '';
+ this.coverPlaying = false;
this.showVideoDialog = false;
+ if (this.convertKey != '') {
+ this.convertStop();
+ }
+ this.convertKey = ''
},
+
copySharedInfo: function (data) {
console.log('澶嶅埗鍐呭锛�' + data);
+ this.coverPlaying = false;
+ this.tracks = []
let _this = this;
this.$copyText(data).then(
function (e) {
@@ -293,9 +370,9 @@
},
playRecord: function (row) {
let that = this;
- if (that.ssrc != "") {
+ if (that.streamId != "") {
that.stopPlayRecord(function () {
- that.ssrc = "",
+ that.streamId = "",
that.playRecord(row);
})
} else {
@@ -305,7 +382,7 @@
row.endTime
}).then(function (res) {
var streamInfo = res.data;
- that.ssrc = streamInfo.ssrc;
+ that.streamId = streamInfo.streamId;
that.videoUrl = streamInfo.ws_flv;
});
}
@@ -315,7 +392,7 @@
this.videoUrl = '';
this.$axios({
method: 'get',
- url: '/api/playback/' + this.ssrc + '/stop'
+ url: '/api/playback/' + this.streamId + '/stop'
}).then(function (res) {
if (callback) callback()
});
@@ -327,7 +404,7 @@
method: 'post',
// url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?leftRight=' + leftRight + '&upDown=' + upDown +
// '&inOut=' + zoom + '&moveSpeed=50&zoomSpeed=50'
- url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + (zoom * 16 + upDown * 4 + leftRight) + '&horizonSpeed=30&verticalSpeed=30&zoomSpeed=' + (2 * 16)
+ url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + (zoom * 16 + upDown * 4 + leftRight) + '&horizonSpeed=' + this.controSpeed + '&verticalSpeed=' + this.controSpeed + '&zoomSpeed=' + this.controSpeed
}).then(function (res) {});
},
//////////////////////鎾斁鍣ㄤ簨浠跺鐞�//////////////////////////
@@ -418,7 +495,7 @@
max-width: 6.25rem;
max-height: 6.25rem;
border-radius: 100%;
- margin-top: 2.5rem;
+ margin-top: 1.5rem;
margin-left: 0.5rem;
float: left;
}
@@ -442,6 +519,9 @@
box-sizing: border-box;
transition: all 0.3s linear;
}
+.control-btn:hover {
+ cursor:pointer
+}
.control-btn i {
font-size: 20px;
@@ -449,6 +529,12 @@
display: flex;
justify-content: center;
align-items: center;
+}
+.control-btn i:hover {
+ cursor:pointer
+}
+.control-zoom-btn:hover {
+ cursor:pointer
}
.control-round {
@@ -576,4 +662,15 @@
.control-bottom .fa {
transform: rotate(-45deg) translateY(7px);
}
+.trank {
+ width: 80%;
+ height: 180px;
+ text-align: left;
+ padding: 0 10%;
+ overflow: auto;
+}
+.trankInfo {
+ width: 80%;
+ padding: 0 10%;
+}
</style>
--
Gitblit v1.8.0