Browse Source

2022/3/17

zkl 3 năm trước cách đây
mục cha
commit
770c1fc0fd

+ 0 - 2
minggao/config/index.js

@@ -13,11 +13,9 @@ module.exports = {
     proxyTable: {
       '/api': {
         //  target: 'http://192.168.1.17:12345', //翟毅飞
-        //  target: 'https://yfznscd.com', //线上
          target: 'https://www.toreskj.com', //线上
         // target: 'http://192.168.1.77:12345', //曹世祥
         // target:"http://114.115.147.140:12345",
-        // target: 'https://www.yfznscd.com',
         changeOrigin: true,
         pathRewrite: {
           '^/api': '/api' //重写接口

+ 2 - 2
minggao/src/components/tree-table/tree_table.vue

@@ -9,10 +9,10 @@
           <td class="td2">组织名称</td>
           <td class="td3" @click="isDesc = !isDesc">
             创建时间
-            <div class="arrow">
+            <!-- <div class="arrow">
               <span class="up-arrow" :class="{ sort: isDesc }"></span>
               <span class="down-arrow" :class="{ sort: !isDesc }"></span>
-            </div>
+            </div> -->
           </td>
           <td class="td4">最后更新时间</td>
           <td class="td6">操作</td>

+ 19 - 3
minggao/src/page/commandCenter/realTime.vue

@@ -214,7 +214,7 @@
             :ref="idName"
             autoplay
             playsinline
-            :muted="true"
+            :muted="false"
           ></video>
         </div>
 
@@ -240,7 +240,7 @@
             :ref="idName1"
             autoplay
             playsinline
-            :muted="true"
+            :muted="false"
           ></video>
         </div>
 
@@ -752,7 +752,7 @@ export default {
     },
     // 拉流
     async tensile(streamID) {
-      var playOption = {videoDecodeType: 'H264'}
+      var playOption = {videoDecodeType: 'H264', playType:'video'}
       const remoteStream = await this.zg.startPlayingStream(streamID, playOption);
       // remoteVideo 为本地 <video> 或 <audio> 对象
       this.$refs["remoteVideo"].srcObject = remoteStream;
@@ -1035,6 +1035,7 @@ export default {
           console.log("有其他用户开启或关闭音频");
           if (updateType == "ADD") {
             // 流新增,开始拉流
+            console.log('这是拉流的ID', streamList)
             this.tensile(streamList[0].streamID);
           } else if (updateType == "DELETE") {
             // 流删除,停止拉流
@@ -1046,11 +1047,26 @@ export default {
       this.zg.on("publisherStateUpdate", (result) => {
         // 推流状态更新回调
         console.log("推流状态更新");
+        console.log(result);
       });
 
       this.zg.on("publishQualityUpdate", (streamID, stats) => {
         // 推流质量回调
         console.log("推流质量更新");
+        console.log(streamID, stats);
+      });
+
+      this.zg.on("playerStateUpdate", (result) => {
+        // 拉流状态回调
+        console.log("拉流状态的回调");
+        console.log(result);
+      });
+
+      this.zg.on("playQualityUpdate", (streamID, stats) => {
+        // 拉流成功后回调
+        console.log("拉流质量回调");
+        console.log(streamID);
+        console.log(stats);
       });
     },
     // 检测是否兼容当前浏览器