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

Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	web_src/src/components/dialog/devicePlayer.vue
#	web_src/src/components/live.vue
This commit is contained in:
648540858
2022-11-08 20:43:25 +08:00
parent aed45e0f0d c62a8986dd
commit 96bb3814f6
91 changed files with 741 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web_src/src/components/live.vue
View File

@@ -138,8 +138,14 @@ export default {
url: '/api/play/start/' + deviceId + '/' + channelId
}).then(function (res) {
if (res.data.code === 0 && res.data.data) {
itemData.playUrl = res.data.data.https_flv.url
that.setPlayUrl(res.data.data.ws_flv.url, idxTmp)
let videoUrl;
if (location.protocol === "https:") {
videoUrl = res.data.data.wss_flv.url;
} else {
videoUrl = res.data.data.ws_flv.url;
}
itemData.playUrl = videoUrl;
that.setPlayUrl(videoUrl, idxTmp);
} else {
that.$message.error(res.data.msg);
}