diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 4d8f7199..0df4b022 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -121,6 +121,10 @@
RTC:
{{ streamInfo.rtc }}
+
+ RTCS:
+ {{ streamInfo.rtcs }}
+
RTMP:
{{ streamInfo.rtmp }}
@@ -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]]
+ this.videoUrl = this.getUrlByStreamInfo()
console.log(this.videoUrl)
},
openDialog: function (tab, deviceId, channelId, param) {
diff --git a/web_src/src/components/dialog/rtcPlayer.vue b/web_src/src/components/dialog/rtcPlayer.vue
index 4737849b..f957df71 100644
--- a/web_src/src/components/dialog/rtcPlayer.vue
+++ b/web_src/src/components/dialog/rtcPlayer.vue
@@ -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)
diff --git a/web_src/src/components/live.vue b/web_src/src/components/live.vue
index c2c09f4c..4a7af491 100644
--- a/web_src/src/components/live.vue
+++ b/web_src/src/components/live.vue
@@ -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.httpsFlv
- that.setPlayUrl(res.data.data.ws_flv, idxTmp)
+ let videoUrl;
+ if (location.protocol === "https:") {
+ videoUrl = res.data.data.wss_flv;
+ } else {
+ videoUrl = res.data.data.ws_flv;
+ }
+ itemData.playUrl = videoUrl;
+ that.setPlayUrl(videoUrl, idxTmp);
} else {
that.$message.error(res.data.msg);
}