From f4ee7271e70acb596bdd74321faf228658afccec Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 08 十一月 2022 20:03:01 +0800 Subject: [PATCH] Merge pull request #661 from xiaoQQya/wvp-28181-2.0 --- web_src/src/components/dialog/rtcPlayer.vue | 4 ++-- web_src/src/components/dialog/devicePlayer.vue | 8 ++++++-- web_src/src/components/live.vue | 10 ++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue index 4d8f719..0df4b02 100644 --- a/web_src/src/components/dialog/devicePlayer.vue +++ b/web_src/src/components/dialog/devicePlayer.vue @@ -121,6 +121,10 @@ <el-tag >RTC:</el-tag> <span>{{ streamInfo.rtc }}</span> </el-dropdown-item> + <el-dropdown-item :command="streamInfo.rtcs"> + <el-tag >RTCS:</el-tag> + <span>{{ streamInfo.rtcs }}</span> + </el-dropdown-item> <el-dropdown-item :command="streamInfo.rtmp"> <el-tag >RTMP:</el-tag> <span>{{ streamInfo.rtmp }}</span> @@ -322,7 +326,7 @@ player: { jessibuca : ["ws_flv", "wss_flv"], livePlayer : ["ws_flv", "wss_flv"], - webRTC: ["rtc", "rtc"], + webRTC: ["rtc", "rtcs"], }, videoHistory: { date: '', @@ -393,7 +397,7 @@ 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 4737849..f957df7 100644 --- a/web_src/src/components/dialog/rtcPlayer.vue +++ b/web_src/src/components/dialog/rtcPlayer.vue @@ -51,7 +51,7 @@ }); webrtcPlayer.on(ZLMRTCClient.Events.WEBRTC_ON_REMOTE_STREAMS,(e)=>{//鑾峰彇鍒颁簡杩滅娴侊紝鍙互鎾斁 - console.error('鎾斁鎴愬姛',e.streams) + console.log('鎾斁鎴愬姛',e.streams) this.eventcallbacK("playing", "鎾斁鎴愬姛") }); @@ -59,7 +59,7 @@ 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 c2c09f4..4a7af49 100644 --- a/web_src/src/components/live.vue +++ b/web_src/src/components/live.vue @@ -138,8 +138,14 @@ 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); } -- Gitblit v1.8.0