From c0e5478a847ff095e2386562de6991cff9c5e949 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 23 八月 2022 08:45:38 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/dialog/devicePlayer.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index f2f2e54..d9c003a 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;
@@ -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, // 鏄惁鎵撳嵃鏃ュ織
--
Gitblit v1.8.0