XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wvp-28181-2.0'

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/Login.vue
This commit is contained in:
648540858
2022-08-22 16:53:16 +08:00
parent cb16cabb64 042b28b2d6
commit ecf4fbb684
146 changed files with 2878 additions and 17348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web_src/src/components/dialog/devicePlayer.vue
View File

@@ -453,6 +453,7 @@ export default {
this.playFromStreamInfo(false, streamInfo)
},
getUrlByStreamInfo(){
console.log(this.streamInfo)
if (location.protocol === "https:") {
this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
}else {
@@ -467,9 +468,9 @@ export default {
this.$refs[this.activePlayer].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) {
if (res.data.code === 0) {
that.convertKey = res.data.key;
setTimeout(()=>{
that.isLoging = false;
@@ -623,13 +624,15 @@ export default {
url: '/api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
row.endTime
}).then(function (res) {
that.streamInfo = res.data;
if (res.data.code === 0) {
that.streamInfo = res.data.data;
that.app = that.streamInfo.app;
that.streamId = that.streamInfo.stream;
that.mediaServerId = that.streamInfo.mediaServerId;
that.ssrc = that.streamInfo.ssrc;
that.videoUrl = that.getUrlByStreamInfo();
that.recordPlay = true;
}
that.recordPlay = true;
});
}
},