From 83411ad1277f8d4dfbc95aff2f15900150e84db3 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 07 六月 2021 15:11:53 +0800
Subject: [PATCH] 设备信息增加最近注册时间和最近心跳时间，心跳超时时间变为可配置
---
web_src/src/components/dialog/devicePlayer.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 02fe283..bc6d3e8 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -270,10 +270,17 @@
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.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`;
},
coverPlay: function () {
var that = this;
@@ -335,7 +342,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('鍏抽棴瑙嗛');
@@ -418,7 +425,7 @@
}).then(function (res) {
var streamInfo = res.data;
that.streamId = streamInfo.streamId;
- that.videoUrl = streamInfo.ws_flv;
+ that.videoUrl = this.getUrlByStreamInfo(streamInfo);
that.recordPlay = true;
});
}
--
Gitblit v1.8.0