Merge branch '级联' into main-dev

648540858

2023-03-20 26bdf2e7768ee5dfc400c3970a5aa129fed49453

 web_src/src/components/dialog/devicePlayer.vue

@@ -693,7 +693,7 @@
          let pushKey = res.data.data.pushKey;
          // 获取推流鉴权KEY
          url += "&sign=" + crypto.createHash('md5').update(pushKey, "utf8").digest('hex')
          console.log("开始语音对讲： " + url)
              console.log("开始语音喊话： " + url)
          this.broadcastRtc = new ZLMRTCClient.Endpoint({
            debug: true, // 是否打印日志
            zlmsdpUrl: url, //流地址
@@ -719,7 +719,7 @@
            console.error('不支持webrtc', e)
            this.$message({
              showClose: true,
              message: '不支持webrtc, 无法进行语音对讲',
                  message: '不支持webrtc, 无法进行语音喊话',
              type: 'error'
            });
            this.broadcastStatus = -1;