From 89a9ab4534f10a224f70e546db838423e84a1965 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期五, 16 七月 2021 16:34:51 +0800
Subject: [PATCH] 添加zlm集群支持
---
web_src/src/components/dialog/devicePlayer.vue | 69 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 9ed1802..020cc22 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -1,9 +1,9 @@
<template>
<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()">
+ <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" :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">
@@ -14,15 +14,27 @@
</div>
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">鎾斁鍦板潃锛�</span>
- <el-input v-model="getPlayerShared.sharedUrl" :disabled="true" v-on:click.native="copySharedInfo(getPlayerShared.sharedUrl)"></el-input>
+ <el-input v-model="getPlayerShared.sharedUrl" :disabled="true" >
+ <template slot="append">
+ <i class="cpoy-btn el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="getPlayerShared.sharedUrl" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></i>
+ </template>
+ </el-input>
</div>
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">iframe锛�</span>
- <el-input v-model="getPlayerShared.sharedIframe" :disabled="true" v-on:click.native="copySharedInfo(getPlayerShared.sharedIframe)"></el-input>
+ <el-input v-model="getPlayerShared.sharedIframe" :disabled="true" >
+ <template slot="append">
+ <i class="cpoy-btn el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="getPlayerShared.sharedIframe" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></i>
+ </template>
+ </el-input>
</div>
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">璧勬簮鍦板潃锛�</span>
- <el-input v-model="getPlayerShared.sharedRtmp" :disabled="true" v-on:click.native="copySharedInfo(getPlayerShared.sharedRtmp)"></el-input>
+ <el-input v-model="getPlayerShared.sharedRtmp" :disabled="true" >
+ <template slot="append">
+ <i class="cpoy-btn el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="getPlayerShared.sharedRtmp" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></i>
+ </template>
+ </el-input>
</div>
</el-tab-pane>
<!--{"code":0,"data":{"paths":["22-29-30.mp4"],"rootPath":"/home/kkkkk/Documents/ZLMediaKit/release/linux/Debug/www/record/hls/kkkkk/2020-05-11/"}}-->
@@ -105,12 +117,13 @@
</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" style="width: 50%; float: left">
+ <p v-if="tracksNotLoaded" style="text-align: center;padding-top: 3rem;">鏆傛棤鏁版嵁</p>
+ <div v-for="(item, index) in tracks" style="width: 50%; float: left" loading>
<span >娴� {{index}}</span>
<div class="trankInfo" v-if="item.codec_type == 0">
<p>鏍煎紡: {{item.codec_id_name}}</p>
@@ -137,7 +150,9 @@
<script>
// import player from '../dialog/rtcPlayer.vue'
-import player from '../dialog/easyPlayer.vue'
+// import LivePlayer from '@liveqing/liveplayer'
+// import player from '../dialog/easyPlayer.vue'
+import player from '../dialog/jessibuca.vue'
export default {
name: 'devicePlayer',
props: {},
@@ -146,9 +161,10 @@
},
computed: {
getPlayerShared: function () {
+
return {
- sharedUrl: window.location.host + '/' + this.videoUrl,
- sharedIframe: '<iframe src="' + window.location.host + '/' + this.videoUrl + '"></iframe>',
+ sharedUrl: window.location.origin + '/#/play/wasm/' + encodeURIComponent(this.videoUrl),
+ sharedIframe: '<iframe src="' + window.location.origin + '/#/play/wasm/' + encodeURIComponent(this.videoUrl) + '"></iframe>',
sharedRtmp: this.videoUrl
};
}
@@ -165,11 +181,12 @@
showVideoDialog: false,
streamId: '',
app : '',
+ mediaServerId : '',
convertKey: '',
deviceId: '',
channelId: '',
tabActiveName: 'media',
- hasaudio: false,
+ hasAudio: false,
loadingRecords: false,
recordsLoading: false,
isLoging: false,
@@ -189,6 +206,7 @@
recordPlay: "",
showPtz: true,
showRrecord: true,
+ tracksNotLoaded: false,
};
},
methods: {
@@ -197,15 +215,17 @@
var that = this;
that.tracks = [];
that.tracksLoading = true;
+ that.tracksNotLoaded = false;
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) {
that.tracks = res.data.tracks;
}else{
+ that.tracksNotLoaded = true;
that.$message({
showClose: true,
message: '鑾峰彇缂栫爜淇℃伅澶辫触,',
@@ -220,6 +240,7 @@
this.channelId = channelId;
this.deviceId = deviceId;
this.streamId = "";
+ this.mediaServerId = "";
this.app = "";
this.videoUrl = ""
if (!!this.$refs.videoPlayer) {
@@ -236,8 +257,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":
@@ -248,14 +269,20 @@
console.log(val)
},
play: function (streamInfo, hasAudio) {
-
- this.hasaudio = hasAudio;
+ this.hasAudio = hasAudio;
this.isLoging = false;
// this.videoUrl = streamInfo.rtc;
- this.videoUrl = streamInfo.ws_flv;
+ 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`
+ // return `${baseZlmApi}/${streamInfo.app}/${streamInfo.streamId}.flv`;
+ // return `http://${baseZlmApi}/${streamInfo.app}/${streamInfo.streamId}.flv`;
+ return streamInfo.ws_flv;
},
coverPlay: function () {
var that = this;
@@ -317,7 +344,7 @@
playFromStreamInfo: function (realHasAudio, streamInfo) {
this.showVideoDialog = true;
this.hasaudio = realHasAudio && this.hasaudio;
- this.$refs.videoPlayer.play(streamInfo.ws_flv)
+ this.$refs.videoPlayer.play(this.getUrlByStreamInfo(streamInfo))
},
close: function () {
console.log('鍏抽棴瑙嗛');
@@ -399,8 +426,10 @@
row.endTime
}).then(function (res) {
var streamInfo = res.data;
+ that.app = streamInfo.app;
that.streamId = streamInfo.streamId;
- that.videoUrl = streamInfo.ws_flv;
+ that.mediaServerId = streamInfo.mediaServerId;
+ that.videoUrl = that.getUrlByStreamInfo(streamInfo);
that.recordPlay = true;
});
}
@@ -410,7 +439,7 @@
this.videoUrl = '';
this.$axios({
method: 'get',
- url: '/api/playback/stop/' + this.streamId
+ url: '/api/playback/stop/' + this.deviceId + "/" + this.channelId
}).then(function (res) {
if (callback) callback()
});
--
Gitblit v1.8.0