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

8
web_src/src/components/console/ConsoleResource.vue
View File

@@ -1,28 +1,28 @@
<template >
<div id="consoleResource" style="width: 100%; height: 100%; background: #FFFFFF; text-align: center">
<div style="width: 50%;height: 50%; float:left; ">
<el-progress :width="100" :stroke-width="8" type="circle" :percentage="deviceInfo.online/deviceInfo.total*100" style="margin-top: 20px; font-size: 18px"></el-progress>
<el-progress :width="100" :stroke-width="8" type="circle" :percentage="Math.floor(deviceInfo.online/deviceInfo.total*100)" style="margin-top: 20px; font-size: 18px"></el-progress>
<div class="resourceInfo">
设备总数:{{deviceInfo.total}}<br/>
在线数:{{deviceInfo.online}}
</div>
</div>
<div style="width: 50%;height: 50%; float:left; ">
<el-progress :width="100" :stroke-width="10" type="circle" :percentage="channelInfo.online/channelInfo.total*100" style="margin-top: 20px"></el-progress>
<el-progress :width="100" :stroke-width="10" type="circle" :percentage="Math.floor(channelInfo.online/channelInfo.total*100)" style="margin-top: 20px"></el-progress>
<div class="resourceInfo">
通道总数:{{channelInfo.total}}<br/>
在线数:{{channelInfo.online}}
</div>
</div>
<div style="width: 50%;height: 50%; float:left; ">
<el-progress :width="100" :stroke-width="10" type="circle" :percentage="pushInfo.online/pushInfo.total*100" style="margin-top: 20px"></el-progress>
<el-progress :width="100" :stroke-width="10" type="circle" :percentage="Math.floor(pushInfo.online/pushInfo.total*100)" style="margin-top: 20px"></el-progress>
<div class="resourceInfo">
推流总数:{{pushInfo.total}}<br/>
在线数:{{pushInfo.online}}
</div>
</div>
<div style="width: 50%;height: 50%; float:left; ">
<el-progress :width="100" :stroke-width="10" type="circle" :percentage="proxyInfo.online/proxyInfo.total*100" style="margin-top: 20px"></el-progress>
<el-progress :width="100" :stroke-width="10" type="circle" :percentage="Math.floor(proxyInfo.online/proxyInfo.total*100)" style="margin-top: 20px"></el-progress>
<div class="resourceInfo">
拉流代理总数:{{proxyInfo.total}}<br/>
在线数:{{proxyInfo.online}}

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

@@ -121,6 +121,10 @@
<el-tag >RTC:</el-tag>
<span>{{ streamInfo.rtc.url }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.rtcs.url">
<el-tag >RTCS:</el-tag>
<span>{{ streamInfo.rtcs }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.rtmp.url">
<el-tag >RTMP:</el-tag>
<span>{{ streamInfo.rtmp.url }}</span>
@@ -322,7 +326,7 @@ export default {
player: {
jessibuca : ["ws_flv", "wss_flv"],
livePlayer : ["ws_flv", "wss_flv"],
webRTC: ["rtc", "rtc"],
webRTC: ["rtc", "rtcs"],
},
videoHistory: {
date: '',
@@ -393,7 +397,7 @@ export default {
changePlayer: function (tab) {
console.log(this.player[tab.name][0])
this.activePlayer = tab.name;
this.videoUrl = this.streamInfo[this.player[tab.name][0]].url
this.videoUrl = this.getUrlByStreamInfo()
console.log(this.videoUrl)
},
openDialog: function (tab, deviceId, channelId, param) {

4
web_src/src/components/dialog/rtcPlayer.vue
View File

@@ -51,7 +51,7 @@ export default {
});
webrtcPlayer.on(ZLMRTCClient.Events.WEBRTC_ON_REMOTE_STREAMS,(e)=>{//获取到了远端流，可以播放
console.error('播放成功',e.streams)
console.log('播放成功',e.streams)
this.eventcallbacK("playing", "播放成功")
});
@@ -59,7 +59,7 @@ export default {
console.error('offer anwser 交换失败',e)
this.eventcallbacK("OFFER ANSWER ERROR ", "offer anwser 交换失败")
if (e.code ==-400 && e.msg=="流不存在"){
console.log("111111")
console.log("流不存在")
this.timer = setTimeout(()=>{
this.webrtcPlayer.close();
this.play(url)

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);
}