From 038d360dd4f2dd3c06f5d97dc66ed13fd78de212 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 27 六月 2022 09:38:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rtc' into commercial
---
web_src/src/components/dialog/devicePlayer.vue | 292 ++++++++++++++--------------------------------------------
1 files changed, 72 insertions(+), 220 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index aba35dd..a98656a 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -3,23 +3,9 @@
<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">
- <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>
- <el-tab-pane label="WebRTC" name="webRTC">
- <rtc-player v-if="activePlayer === 'webRTC'" ref="webRTC" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></rtc-player>
- </el-tab-pane>
- <el-tab-pane label="h265web">h265web鏁鏈熷緟</el-tab-pane>
- <el-tab-pane label="wsPlayer">wsPlayer 鏁鏈熷緟</el-tab-pane>
- </el-tabs>
- <jessibucaPlayer v-if="Object.keys(this.player).length == 1 && this.player.jessibuca" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer>
- <rtc-player v-if="Object.keys(this.player).length == 1 && this.player.webRTC" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></rtc-player>
-
- </div>
+ <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-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>-->
@@ -45,100 +31,10 @@
<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" >
- <el-button slot="append" icon="el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="getPlayerShared.sharedRtmp" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></el-button>
- <el-dropdown slot="prepend" v-if="streamInfo" trigger="click" @command="copyUrl">
- <el-button >
- 鏇村鍦板潃<i class="el-icon-arrow-down el-icon--right"></i>
- </el-button>
- <el-dropdown-menu slot="dropdown" >
- <el-dropdown-item :command="streamInfo.flv">
- <el-tag >FLV:</el-tag>
- <span>{{ streamInfo.flv }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.https_flv">
- <el-tag >FLV(https):</el-tag>
- <span>{{ streamInfo.https_flv }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.ws_flv">
- <el-tag >FLV(ws):</el-tag>
- <span >{{ streamInfo.ws_flv }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.wss_flv">
- <el-tag >FLV(wss):</el-tag>
- <span>{{ streamInfo.wss_flv }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.fmp4">
- <el-tag >FMP4:</el-tag>
- <span>{{ streamInfo.fmp4 }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.https_fmp4">
- <el-tag >FMP4(https):</el-tag>
- <span>{{ streamInfo.https_fmp4 }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.ws_fmp4">
- <el-tag >FMP4(ws):</el-tag>
- <span>{{ streamInfo.ws_fmp4 }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.wss_fmp4">
- <el-tag >FMP4(wss):</el-tag>
- <span>{{ streamInfo.wss_fmp4 }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.hls">
- <el-tag>HLS:</el-tag>
- <span>{{ streamInfo.hls }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.https_hls">
- <el-tag >HLS(https):</el-tag>
- <span>{{ streamInfo.https_hls }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.ws_hls">
- <el-tag >HLS(ws):</el-tag>
- <span>{{ streamInfo.ws_hls }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.wss_hls">
- <el-tag >HLS(wss):</el-tag>
- <span>{{ streamInfo.wss_hls }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.ts">
- <el-tag>TS:</el-tag>
- <span>{{ streamInfo.ts }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.https_ts">
- <el-tag>TS(https):</el-tag>
- <span>{{ streamInfo.https_ts }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.ws_ts">
- <el-tag>TS(ws):</el-tag>
- <span>{{ streamInfo.ws_ts }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.wss_ts">
- <el-tag>TS(wss):</el-tag>
- <span>{{ streamInfo.wss_ts }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.rtc">
- <el-tag >RTC:</el-tag>
- <span>{{ streamInfo.rtc }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.rtmp">
- <el-tag >RTMP:</el-tag>
- <span>{{ streamInfo.rtmp }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.rtmps">
- <el-tag >RTMPS:</el-tag>
- <span>{{ streamInfo.rtmps }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.rtsp">
- <el-tag >RTSP:</el-tag>
- <span>{{ streamInfo.rtsp }}</span>
- </el-dropdown-item>
- <el-dropdown-item :command="streamInfo.rtsps">
- <el-tag >RTSPS:</el-tag>
- <span>{{ streamInfo.rtsps }}</span>
- </el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
+ <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/"}}-->
@@ -219,27 +115,27 @@
<div class="control-panel">
<el-button-group>
- <el-tag style="position :absolute; left: 0rem; top: 0rem; width: 5rem; text-align: center" size="medium">棰勭疆浣嶇紪鍙�</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 0rem; width: 5rem; text-align: center" size="medium" type="info">棰勭疆浣嶇紪鍙�</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 0rem; width: 6rem" size="mini" v-model="presetPos" controls-position="right" :precision="0" :step="1" :min="1" :max="255"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 0rem; width: 5rem" size="mini" icon="el-icon-add-location" @click="presetPosition(129, presetPos)">璁剧疆</el-button>
<el-button style="position: absolute; left: 27rem; top: 0rem; width: 5rem" size="mini" type="primary" icon="el-icon-place" @click="presetPosition(130, presetPos)">璋冪敤</el-button>
<el-button style="position: absolute; left: 16rem; top: 0rem; width: 5rem" size="mini" icon="el-icon-delete-location" @click="presetPosition(131, presetPos)">鍒犻櫎</el-button>
- <el-tag style="position :absolute; left: 0rem; top: 2.5rem; width: 5rem; text-align: center" size="medium">宸¤埅閫熷害</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 2.5rem; width: 5rem; text-align: center" size="medium" type="info">宸¤埅閫熷害</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 2.5rem; width: 6rem" size="mini" v-model="cruisingSpeed" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 2.5rem; width: 5rem" size="mini" icon="el-icon-loading" @click="setSpeedOrTime(134, cruisingGroup, cruisingSpeed)">璁剧疆</el-button>
- <el-tag style="position :absolute; left: 16rem; top: 2.5rem; width: 5rem; text-align: center" size="medium">鍋滅暀鏃堕棿</el-tag>
+ <el-tag style="position :absolute; left: 16rem; top: 2.5rem; width: 5rem; text-align: center" size="medium" type="info">鍋滅暀鏃堕棿</el-tag>
<el-input-number style="position: absolute; left: 21rem; top: 2.5rem; width: 6rem" size="mini" v-model="cruisingTime" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
<el-button style="position: absolute; left: 27rem; top: 2.5rem; width: 5rem" size="mini" icon="el-icon-timer" @click="setSpeedOrTime(135, cruisingGroup, cruisingTime)">璁剧疆</el-button>
- <el-tag style="position :absolute; left: 0rem; top: 4.5rem; width: 5rem; text-align: center" size="medium">宸¤埅缁勭紪鍙�</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 4.5rem; width: 5rem; text-align: center" size="medium" type="info">宸¤埅缁勭紪鍙�</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 4.5rem; width: 6rem" size="mini" v-model="cruisingGroup" controls-position="right" :precision="0" :min="0" :max="255"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 4.5rem; width: 5rem" size="mini" icon="el-icon-add-location" @click="setCommand(132, cruisingGroup, presetPos)">娣诲姞鐐�</el-button>
<el-button style="position: absolute; left: 16rem; top: 4.5rem; width: 5rem" size="mini" icon="el-icon-delete-location" @click="setCommand(133, cruisingGroup, presetPos)">鍒犻櫎鐐�</el-button>
<el-button style="position: absolute; left: 21rem; top: 4.5rem; width: 5rem" size="mini" icon="el-icon-delete" @click="setCommand(133, cruisingGroup, 0)">鍒犻櫎缁�</el-button>
<el-button style="position: absolute; left: 27rem; top: 5rem; width: 5rem" size="mini" type="primary" icon="el-icon-video-camera-solid" @click="setCommand(136, cruisingGroup, 0)">宸¤埅</el-button>
- <el-tag style="position :absolute; left: 0rem; top: 7rem; width: 5rem; text-align: center" size="medium">鎵弿閫熷害</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 7rem; width: 5rem; text-align: center" size="medium" type="info">鎵弿閫熷害</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 7rem; width: 6rem" size="mini" v-model="scanSpeed" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 7rem; width: 5rem" size="mini" icon="el-icon-loading" @click="setSpeedOrTime(138, scanGroup, scanSpeed)">璁剧疆</el-button>
- <el-tag style="position :absolute; left: 0rem; top: 9rem; width: 5rem; text-align: center" size="medium">鎵弿缁勭紪鍙�</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 9rem; width: 5rem; text-align: center" size="medium" type="info">鎵弿缁勭紪鍙�</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 9rem; width: 6rem" size="mini" v-model="scanGroup" controls-position="right" :precision="0" :step="1" :min="0" :max="255"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 9rem; width: 5rem" size="mini" icon="el-icon-d-arrow-left" @click="setCommand(137, scanGroup, 1)">宸﹁竟鐣�</el-button>
<el-button style="position: absolute; left: 16rem; top: 9rem; width: 5rem" size="mini" icon="el-icon-d-arrow-right" @click="setCommand(137, scanGroup, 2)">鍙宠竟鐣�</el-button>
@@ -276,28 +172,26 @@
</div>
</el-tab-pane>
-
</el-tabs>
</div>
</el-dialog>
- <recordDownload ref="recordDownload"></recordDownload>
</div>
</template>
<script>
-import rtcPlayer from '../dialog/rtcPlayer.vue'
+import player from '../dialog/rtcPlayer.vue'
// import LivePlayer from '@liveqing/liveplayer'
// import player from '../dialog/easyPlayer.vue'
-import jessibucaPlayer from '../common/jessibuca.vue'
-import recordDownload from '../dialog/recordDownload.vue'
+// import player from '../dialog/jessibuca.vue'
export default {
name: 'devicePlayer',
props: {},
components: {
- jessibucaPlayer, rtcPlayer, recordDownload,
+ player,
},
computed: {
getPlayerShared: function () {
+
return {
sharedUrl: window.location.origin + '/#/play/wasm/' + encodeURIComponent(this.videoUrl),
sharedIframe: '<iframe src="' + window.location.origin + '/#/play/wasm/' + encodeURIComponent(this.videoUrl) + '"></iframe>',
@@ -305,22 +199,11 @@
};
}
},
- created() {
- console.log(this.player)
- if (Object.keys(this.player).length === 1) {
- this.activePlayer = Object.keys(this.player)[0]
- }
- },
+ created() {},
data() {
return {
video: 'http://lndxyj.iqilu.com/public/upload/2019/10/14/8c001ea0c09cdc59a57829dabc8010fa.mp4',
videoUrl: '',
- activePlayer: "jessibuca",
- // 濡備綍浣犲彧鏄敤涓�绉嶆挱鏀惧櫒锛岀洿鎺ユ敞閲婃帀涓嶇敤鐨勯儴鍒嗗嵆鍙�
- player: {
- jessibuca : ["ws_flv", "wss_flv"],
- webRTC: ["rtc", "rtc"],
- },
videoHistory: {
date: '',
searchHistoryResult: [] //濯掍綋娴佸巻鍙茶褰曟悳绱㈢粨鏋�
@@ -358,7 +241,6 @@
seekTime: 0,
recordStartTime: 0,
showTimeText: "00:00:00",
- streamInfo: null,
};
},
methods: {
@@ -368,7 +250,7 @@
that.tracks = [];
that.tracksLoading = true;
that.tracksNotLoaded = false;
- if (tab.name === "codec") {
+ 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
@@ -387,12 +269,6 @@
}).catch(function (e) {});
}
},
- changePlayer: function (tab) {
- console.log(this.player[tab.name][0])
- this.activePlayer = tab.name;
- this.videoUrl = this.streamInfo[this.player[tab.name][0]]
- console.log(this.videoUrl)
- },
openDialog: function (tab, deviceId, channelId, param) {
this.tabActiveName = tab;
this.channelId = channelId;
@@ -401,8 +277,8 @@
this.mediaServerId = "";
this.app = "";
this.videoUrl = ""
- if (!!this.$refs[this.activePlayer]) {
- this.$refs[this.activePlayer].pause();
+ if (!!this.$refs.videoPlayer) {
+ this.$refs.videoPlayer.pause();
}
switch (tab) {
case "media":
@@ -427,32 +303,44 @@
console.log(val)
},
play: function (streamInfo, hasAudio) {
- this.streamInfo = streamInfo;
this.hasAudio = hasAudio;
this.isLoging = false;
- // this.videoUrl = streamInfo.rtc;
- this.videoUrl = this.getUrlByStreamInfo();
- this.streamId = streamInfo.stream;
+ 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(){
+ 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`;
if (location.protocol === "https:") {
- this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
+ if (streamInfo.wss_flv === null) {
+ console.error("濯掍綋鏈嶅姟鍣ㄦ湭閰嶇疆ssl绔彛, 浣跨敤http绔彛")
+ // this.$message({
+ // showClose: true,
+ // message: '濯掍綋鏈嶅姟鍣ㄦ湭閰嶇疆ssl绔彛, ',
+ // type: 'error'
+ // });
+ return streamInfo.ws_flv
+ }else {
+ return streamInfo.wss_flv;
+ }
+
}else {
- this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]]
+ return streamInfo.ws_flv;
}
- return this.videoUrl;
},
coverPlay: function () {
var that = this;
this.coverPlaying = true;
- this.$refs[this.activePlayer].pause()
+ this.$refs.videoPlayer.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) {
that.convertKey = res.data.key;
@@ -481,7 +369,7 @@
},
convertStopClick: function() {
this.convertStop(()=>{
- this.$refs[this.activePlayer].play(this.videoUrl)
+ this.$refs.videoPlayer.play(this.videoUrl)
});
},
convertStop: function(callback) {
@@ -506,12 +394,12 @@
playFromStreamInfo: function (realHasAudio, streamInfo) {
this.showVideoDialog = true;
this.hasaudio = realHasAudio && this.hasaudio;
- this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
+ this.$refs.videoPlayer.play(this.getUrlByStreamInfo(streamInfo))
},
close: function () {
console.log('鍏抽棴瑙嗛');
- if (!!this.$refs[this.activePlayer]){
- this.$refs[this.activePlayer].pause();
+ if (!!this.$refs.videoPlayer){
+ this.$refs.videoPlayer.pause();
}
this.videoUrl = '';
this.coverPlaying = false;
@@ -562,19 +450,9 @@
method: 'get',
url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
}).then(function (res) {
- console.log(res)
- if(res.data.code === 0) {
- // 澶勭悊鏃堕棿淇℃伅
- that.videoHistory.searchHistoryResult = res.data.data.recordList;
- that.recordsLoading = false;
- }else {
- this.$message({
- showClose: true,
- message: res.data.msg,
- type: "error",
- });
- }
-
+ // 澶勭悊鏃堕棿淇℃伅
+ that.videoHistory.searchHistoryResult = res.data.recordList;
+ that.recordsLoading = false;
}).catch(function (e) {
console.log(e.message);
// that.videoHistory.searchHistoryResult = falsificationData.recordData;
@@ -596,8 +474,8 @@
console.log(this.seekTime)
if (that.streamId != "") {
that.stopPlayRecord(function () {
- that.streamId = "";
- that.playRecord(row);
+ that.streamId = "",
+ that.playRecord(row);
})
} else {
this.$axios({
@@ -607,20 +485,19 @@
}).then(function (res) {
var streamInfo = res.data;
that.app = streamInfo.app;
- that.streamId = streamInfo.stream;
+ that.streamId = streamInfo.streamId;
that.mediaServerId = streamInfo.mediaServerId;
- that.ssrc = streamInfo.ssrc;
that.videoUrl = that.getUrlByStreamInfo(streamInfo);
that.recordPlay = true;
});
}
},
stopPlayRecord: function (callback) {
- this.$refs[this.activePlayer].pause();
+ this.$refs.videoPlayer.pause();
this.videoUrl = '';
this.$axios({
method: 'get',
- url: '/api/playback/stop/' + this.deviceId + "/" + this.channelId + "/" + this.streamId
+ url: '/api/playback/stop/' + this.deviceId + "/" + this.channelId
}).then(function (res) {
if (callback) callback()
});
@@ -628,47 +505,33 @@
downloadRecord: function (row) {
let that = this;
if (that.streamId != "") {
- that.stopDownloadRecord(function (res) {
- if (res.code == 0) {
- that.streamId = "";
- that.downloadRecord(row);
- }else {
- this.$message({
- showClose: true,
- message: res.data.msg,
- type: "error",
- });
- }
-
+ that.stopDownloadRecord(function () {
+ that.streamId = "",
+ that.downloadRecord(row);
})
} else {
this.$axios({
method: 'get',
- url: '/api/gb_record/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
+ url: '/api/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
row.endTime + '&downloadSpeed=4'
}).then(function (res) {
- if (res.data.code == 0) {
- let streamInfo = res.data.data;
- that.recordPlay = false;
- that.$refs.recordDownload.openDialog(that.deviceId, that.channelId, streamInfo.app, streamInfo.stream, streamInfo.mediaServerId);
- }else {
- that.$message({
- showClose: true,
- message: res.data.msg,
- type: "error",
- });
- }
+ 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[this.activePlayer].pause();
+ this.$refs.videoPlayer.pause();
this.videoUrl = '';
this.$axios({
method: 'get',
- url: '/api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.streamId
- }).then((res)=> {
- if (callback) callback(res)
+ url: '/api/download/stop/' + this.deviceId + "/" + this.channelId
+ }).then(function (res) {
+ if (callback) callback()
});
},
ptzCamera: function (command) {
@@ -676,6 +539,8 @@
let that = this;
this.$axios({
method: 'post',
+ // url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?leftRight=' + leftRight + '&upDown=' + upDown +
+ // '&inOut=' + zoom + '&moveSpeed=50&zoomSpeed=50'
url: '/api/ptz/control/' + this.deviceId + '/' + this.channelId + '?command=' + command + '&horizonSpeed=' + this.controSpeed + '&verticalSpeed=' + this.controSpeed + '&zoomSpeed=' + this.controSpeed
}).then(function (res) {});
},
@@ -755,21 +620,13 @@
console.log(resultArray)
return resultArray;
},
- copyUrl: function (dropdownItem){
- console.log(dropdownItem)
- this.$copyText(dropdownItem).then((e)=> {
- this.$message.success("鎴愬姛鎷疯礉鍒扮矘璐存澘");
- }, (e)=> {
-
- })
- },
gbPlay(){
console.log('鍓嶇鎺у埗锛氭挱鏀�');
this.$axios({
method: 'get',
url: '/api/playback/resume/' + this.streamId
}).then((res)=> {
- this.$refs[this.activePlayer].play(this.videoUrl)
+ this.$refs.videoPlayer.play(this.videoUrl)
});
},
gbPause(){
@@ -798,13 +655,8 @@
this.$axios({
method: 'get',
url: `/api/playback/seek/${this.streamId }/` + Math.floor(this.seekTime * val / 100000)
- }).then( (res)=> {
- setTimeout(()=>{
- this.$refs[this.activePlayer].play(this.videoUrl)
- }, 600)
- });
- },
-
+ }).then(function (res) {});
+ }
}
};
--
Gitblit v1.8.0