From 116d979d87f53f878a8c930cfad2c6a7cc831b19 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 八月 2022 16:58:31 +0800
Subject: [PATCH] 合并主线
---
web_src/src/components/dialog/devicePlayer.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index d5a3ff4..c11df1d 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/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;
@@ -861,6 +862,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 +920,7 @@
this.broadcastStatus = 0;
}else if (e === "connected") {
this.broadcastStatus = 1;
- }else {
+ }else if (e === "disconnected") {
this.broadcastStatus = -1;
}
});
--
Gitblit v1.8.0