From d340a37a00c8d5ea2605ca0f40a920efbeb9546f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 十一月 2022 11:31:30 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network

---
 web_src/src/components/dialog/devicePlayer.vue |  106 +++++++++++++++++++++++++++-------------------------
 1 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 7e62ef7..e640d6f 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -4,9 +4,9 @@
     <el-dialog title="瑙嗛鎾斁" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()">
       <div style="width: 100%; height: 100%">
         <el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1">
-          <el-tab-pane label="LivePlayer" name="livePlayer">
-            <LivePlayer v-if="showVideoDialog" ref="livePlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasAudio" fluent autoplay live></LivePlayer>
-          </el-tab-pane>
+<!--          <el-tab-pane label="LivePlayer" name="livePlayer">-->
+<!--            <LivePlayer v-if="showVideoDialog" ref="livePlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasAudio" fluent autoplay live></LivePlayer>-->
+<!--          </el-tab-pane>-->
           <el-tab-pane label="Jessibuca" name="jessibuca">
             <jessibucaPlayer v-if="activePlayer === 'jessibuca'" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer>
           </el-tab-pane>
@@ -53,89 +53,93 @@
                                 鏇村鍦板潃<i class="el-icon-arrow-down el-icon--right"></i>
                               </el-button>
                               <el-dropdown-menu slot="dropdown" >
-                                <el-dropdown-item :command="streamInfo.flv">
+                                <el-dropdown-item :command="streamInfo.flv.url">
                                   <el-tag >FLV:</el-tag>
-                                  <span>{{ streamInfo.flv }}</span>
+                                  <span>{{ streamInfo.flv.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.https_flv">
+                                <el-dropdown-item :command="streamInfo.https_flv.url">
                                   <el-tag >FLV(https):</el-tag>
-                                  <span>{{ streamInfo.https_flv }}</span>
+                                  <span>{{ streamInfo.https_flv.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.ws_flv">
+                                <el-dropdown-item :command="streamInfo.ws_flv.url">
                                   <el-tag  >FLV(ws):</el-tag>
-                                  <span >{{ streamInfo.ws_flv }}</span>
+                                  <span >{{ streamInfo.ws_flv.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.wss_flv">
+                                <el-dropdown-item :command="streamInfo.wss_flv.url">
                                   <el-tag  >FLV(wss):</el-tag>
-                                  <span>{{ streamInfo.wss_flv }}</span>
+                                  <span>{{ streamInfo.wss_flv.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.fmp4">
+                                <el-dropdown-item :command="streamInfo.fmp4.url">
                                   <el-tag >FMP4:</el-tag>
-                                  <span>{{ streamInfo.fmp4 }}</span>
+                                  <span>{{ streamInfo.fmp4.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.https_fmp4">
+                                <el-dropdown-item :command="streamInfo.https_fmp4.url">
                                   <el-tag >FMP4(https):</el-tag>
-                                  <span>{{ streamInfo.https_fmp4 }}</span>
+                                  <span>{{ streamInfo.https_fmp4.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.ws_fmp4">
+                                <el-dropdown-item :command="streamInfo.ws_fmp4.url">
                                   <el-tag >FMP4(ws):</el-tag>
-                                  <span>{{ streamInfo.ws_fmp4 }}</span>
+                                  <span>{{ streamInfo.ws_fmp4.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.wss_fmp4">
+                                <el-dropdown-item :command="streamInfo.wss_fmp4.url">
                                   <el-tag >FMP4(wss):</el-tag>
-                                  <span>{{ streamInfo.wss_fmp4 }}</span>
+                                  <span>{{ streamInfo.wss_fmp4.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.hls">
+                                <el-dropdown-item :command="streamInfo.hls.url">
                                   <el-tag>HLS:</el-tag>
-                                  <span>{{ streamInfo.hls }}</span>
+                                  <span>{{ streamInfo.hls.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.https_hls">
+                                <el-dropdown-item :command="streamInfo.https_hls.url">
                                   <el-tag >HLS(https):</el-tag>
-                                  <span>{{ streamInfo.https_hls }}</span>
+                                  <span>{{ streamInfo.https_hls.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.ws_hls">
+                                <el-dropdown-item :command="streamInfo.ws_hls.url">
                                   <el-tag >HLS(ws):</el-tag>
-                                  <span>{{ streamInfo.ws_hls }}</span>
+                                  <span>{{ streamInfo.ws_hls.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.wss_hls">
+                                <el-dropdown-item :command="streamInfo.wss_hls.url">
                                   <el-tag >HLS(wss):</el-tag>
-                                  <span>{{ streamInfo.wss_hls }}</span>
+                                  <span>{{ streamInfo.wss_hls.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.ts">
+                                <el-dropdown-item :command="streamInfo.ts.url">
                                   <el-tag>TS:</el-tag>
-                                  <span>{{ streamInfo.ts }}</span>
+                                  <span>{{ streamInfo.ts.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.https_ts">
+                                <el-dropdown-item :command="streamInfo.https_ts.url">
                                   <el-tag>TS(https):</el-tag>
-                                  <span>{{ streamInfo.https_ts }}</span>
+                                  <span>{{ streamInfo.https_ts.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.ws_ts">
+                                <el-dropdown-item :command="streamInfo.ws_ts.url">
                                   <el-tag>TS(ws):</el-tag>
-                                  <span>{{ streamInfo.ws_ts }}</span>
+                                  <span>{{ streamInfo.ws_ts.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.wss_ts">
+                                <el-dropdown-item :command="streamInfo.wss_ts.url">
                                   <el-tag>TS(wss):</el-tag>
-                                  <span>{{ streamInfo.wss_ts }}</span>
+                                  <span>{{ streamInfo.wss_ts.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.rtc">
+                                <el-dropdown-item :command="streamInfo.rtc.url">
                                   <el-tag >RTC:</el-tag>
-                                  <span>{{ streamInfo.rtc }}</span>
+                                  <span>{{ streamInfo.rtc.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.rtmp">
+                                <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 }}</span>
+                                  <span>{{ streamInfo.rtmp.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.rtmps">
+                                <el-dropdown-item :command="streamInfo.rtmps.url">
                                   <el-tag >RTMPS:</el-tag>
-                                  <span>{{ streamInfo.rtmps }}</span>
+                                  <span>{{ streamInfo.rtmps.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.rtsp">
+                                <el-dropdown-item :command="streamInfo.rtsp.url">
                                   <el-tag >RTSP:</el-tag>
-                                  <span>{{ streamInfo.rtsp }}</span>
+                                  <span>{{ streamInfo.rtsp.url }}</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item :command="streamInfo.rtsps">
+                                <el-dropdown-item :command="streamInfo.rtsps.url">
                                   <el-tag >RTSPS:</el-tag>
-                                  <span>{{ streamInfo.rtsps }}</span>
+                                  <span>{{ streamInfo.rtsps.url }}</span>
                                 </el-dropdown-item>
                               </el-dropdown-menu>
                             </el-dropdown>
@@ -317,12 +321,12 @@
         return {
             video: 'http://lndxyj.iqilu.com/public/upload/2019/10/14/8c001ea0c09cdc59a57829dabc8010fa.mp4',
             videoUrl: '',
-            activePlayer: "livePlayer",
+            activePlayer: "jessibuca",
             // 濡備綍浣犲彧鏄敤涓�绉嶆挱鏀惧櫒锛岀洿鎺ユ敞閲婃帀涓嶇敤鐨勯儴鍒嗗嵆鍙�
             player: {
               jessibuca : ["ws_flv", "wss_flv"],
-              // livePlayer : ["ws_flv", "wss_flv"],
-              webRTC: ["rtc", "rtc"],
+              livePlayer : ["ws_flv", "wss_flv"],
+              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) {
@@ -446,9 +450,9 @@
         getUrlByStreamInfo(){
             console.log(this.streamInfo)
             if (location.protocol === "https:") {
-              this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
+              this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]].url
             }else {
-              this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]]
+              this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]].url
             }
             return this.videoUrl;
 

--
Gitblit v1.8.0