Merge branch 'wvp-28181-2.0'

648540858

2022-08-22 ecf4fbb68445cf412d5e946f67f92c9928df8273

 web_src/src/components/dialog/devicePlayer.vue

@@ -298,6 +298,7 @@

<script>
import rtcPlayer from '../dialog/rtcPlayer.vue'
import crypto from 'crypto'
// import LivePlayer from '@liveqing/liveplayer'
// import player from '../dialog/easyPlayer.vue'
import jessibucaPlayer from '../common/jessibuca.vue'
@@ -388,7 +389,7 @@
                    url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId
                }).then(function (res) {
                    that.tracksLoading = false;
                    if (res.data.code == 0 && res.data.online) {
                    if (res.data.code == 0 && res.data.tracks) {
                        that.tracks = res.data.tracks;
                    }else{
                        that.tracksNotLoaded = true;
@@ -452,6 +453,7 @@
            this.playFromStreamInfo(false, streamInfo)
        },
        getUrlByStreamInfo(){
            console.log(this.streamInfo)
            if (location.protocol === "https:") {
              this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
            }else {
@@ -466,9 +468,9 @@
            this.$refs[this.activePlayer].pause()
            that.$axios({
                method: 'post',
                url: '/api/gb_record/convert/' + that.streamId
                url: '/api/play/convert/' + that.streamId
                }).then(function (res) {
                    if (res.data.code == 0) {
                    if (res.data.code === 0) {
                        that.convertKey = res.data.key;
                        setTimeout(()=>{
                            that.isLoging = false;
@@ -622,13 +624,15 @@
                    url: '/api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
                        row.endTime
                }).then(function (res) {
                    that.streamInfo = res.data;
                  if (res.data.code === 0) {
                    that.streamInfo = res.data.data;
                    that.app = that.streamInfo.app;
                    that.streamId = that.streamInfo.stream;
                    that.mediaServerId = that.streamInfo.mediaServerId;
                    that.ssrc = that.streamInfo.ssrc;
                    that.videoUrl = that.getUrlByStreamInfo();
                    that.recordPlay = true;
                  }
                  that.recordPlay = true;
                });
            }
        },
@@ -861,6 +865,10 @@
            }
        },
        startBroadcast(url){
          // 获取推流鉴权KEY
          console.log(this.$loginUser)
          console.log(this.$loginUser.pushKey)
          url += "&sign=" + crypto.createHash('md5').update(this.$loginUser.pushKey, "utf8").digest('hex')
          console.log("开始语音对讲： " + url)
          this.broadcastRtc = new ZLMRTCClient.Endpoint({
            debug: true, // 是否打印日志
@@ -915,7 +923,7 @@
              this.broadcastStatus = 0;
            }else if (e === "connected") {
              this.broadcastStatus = 1;
            }else {
            }else if (e === "disconnected") {
              this.broadcastStatus = -1;
            }
          });
@@ -937,6 +945,7 @@
          }).then( (res)=> {
            if (res.data.code == 0) {
              // this.broadcastStatus = -1;
              // this.broadcastRtc.close()
            }else {
              this.$message({
                showClose: true,