修复点播判断错误导致的15s超长延时 增加默认不关闭推流, 无人观看超时或点击停止按钮关闭流 修复点播其他bug

648540858

2020-10-14 3ec3b88456cf9ac455d93baba40f339bb284dd77

 web_src/src/components/gb28181/devicePlayer.vue

@@ -1,7 +1,7 @@
<template>
   <div id="devicePlayer">
      <el-dialog title="视频播放" top="0" :visible.sync="showVideoDialog" :destroy-on-close="true" @close="stop()">
      <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" fluent autoplay live stretch></LivePlayer>
      <el-dialog title="视频播放" top="0" :visible.sync="showVideoDialog" :destroy-on-close="true" @close="close()">
      <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :hasaudio="hasaudio" fluent autoplay live ></LivePlayer>
         <div id="shared" style="text-align: right; margin-top: 1rem;">
            <el-tabs v-model="tabActiveName">
               <el-tab-pane label="媒体流信息" name="media">
@@ -114,37 +114,42 @@
            ssrc: '',
            deviceId: '',
            channelId: '',
            tabActiveName: 'media'
            tabActiveName: 'media',
        hasaudio: false

         };
      },
      methods: {

         play: function(streamInfo, deviceId, channelId) {
         play: function(streamInfo, deviceId, channelId, hasAudio) {
        console.log(hasAudio);
        this.hasaudio = hasAudio;
        // 根据媒体流信息二次判断
        if( this.hasaudio && !!streamInfo.tracks && streamInfo.tracks.length > 0) {
          var realHasAudio = false;
          for (let i = 0; i < streamInfo.tracks; i++) {
            if (streamInfo.tracks[i].codec_type == 1) { // 判断为音频
              realHasAudio = true;
            }
          }
          this.hasaudio = realHasAudio && this.hasaudio;
        }
        console.log("111")
        console.log(this.hasaudio)
        this.ssrc = streamInfo.ssrc;
            this.deviceId = deviceId;
            this.channelId = channelId;
            this.videoUrl = streamInfo.flv + "?" + new Date().getTime();
        // this.$refs.videoPlayer.hasaudio = hasAudio;
            // this.videoUrl = streamInfo.flv + "?" + new Date().getTime();
            this.videoUrl = streamInfo.ws_flv;
            this.showVideoDialog = true;
            console.log(this.ssrc);
         },
         stop: function() {
         close: function() {
            console.log('关闭视频');
            this.$refs.videoPlayer.pause();
            this.videoUrl = '';
            this.showVideoDialog = false;
            this.$axios({
               method: 'post',
               url: '/api/play/' + this.ssrc + '/stop'
            }).then(function(res) {
               console.log(JSON.stringify(res));
            });

            this.$axios({
               method: 'post',
               url: '/api/playback/' + this.ssrc + '/stop'
            }).then(function(res) {
               console.log(JSON.stringify(res));
            });
         },
         copySharedInfo: function(data) {
            console.log('复制内容：' + data);