From cb16cabb64e99d7f505822a49665725ff5b61ff6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 15 八月 2022 15:37:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/dialog/devicePlayer.vue | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 5c40c31..c11df1d 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -278,8 +278,9 @@
</el-tab-pane>
<el-tab-pane label="璇煶瀵硅" name="broadcast" >
<div class="trank" style="text-align: center;">
- <el-button @click="broadcastStatusClick()" :type="getBroadcastStatus()" circle icon="el-icon-microphone" style="font-size: 32px; padding: 24px;margin-top: 24px;"/>
+ <el-button @click="broadcastStatusClick()" :type="getBroadcastStatus()" :disabled="broadcastStatus === -2" circle icon="el-icon-microphone" style="font-size: 32px; padding: 24px;margin-top: 24px;"/>
<p>
+ <span v-if="broadcastStatus === -2">姝ｅ湪閲婃斁璧勬簮</span>
<span v-if="broadcastStatus === -1">鐐瑰嚮寮�濮嬪璁�</span>
<span v-if="broadcastStatus === 0">绛夊緟鎺ラ�氫腑...</span>
<span v-if="broadcastStatus === 1">璇疯璇�</span>
@@ -297,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'
@@ -371,7 +373,7 @@
showTimeText: "00:00:00",
streamInfo: null,
broadcastRtc: null,
- broadcastStatus: -1, // -1 榛樿鐘舵�� 0 绛夊緟鎺ラ�� 1 鎺ラ�氭垚鍔�
+ broadcastStatus: -1, // -2 姝ｅ湪閲婃斁璧勬簮 -1 榛樿鐘舵�� 0 绛夊緟鎺ラ�� 1 鎺ラ�氭垚鍔�
};
},
methods: {
@@ -387,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;
@@ -537,6 +539,9 @@
this.stopPlayRecord();
}
this.recordPlay = ''
+ if (this.broadcastStatus === 1) {
+ this.stopBroadcast()
+ }
},
copySharedInfo: function (data) {
@@ -818,6 +823,9 @@
});
},
getBroadcastStatus() {
+ if (this.broadcastStatus == -2) {
+ return "primary"
+ }
if (this.broadcastStatus == -1) {
return "primary"
}
@@ -832,6 +840,7 @@
broadcastStatusClick() {
if (this.broadcastStatus == -1) {
// 榛樿鐘舵�侊紝 寮�濮�
+ this.broadcastStatus = 0
// 鍙戣捣璇煶瀵硅
this.$axios({
method: 'get',
@@ -849,12 +858,14 @@
}
});
}else if (this.broadcastStatus === 1) {
- this.broadcastRtc.close()
- this.broadcastRtc = null;
- this.broadcastStatus = -1;
+ this.stopBroadcast()
}
},
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, // 鏄惁鎵撳嵃鏃ュ織
@@ -905,12 +916,12 @@
});
this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ON_CONNECTION_STATE_CHANGE,(e)=>{// offer anwser 浜ゆ崲澶辫触
console.log('鐘舵�佹敼鍙�',e)
- if (e === "failed") {
- this.broadcastStatus = -1;
- }else if (e === "connecting") {
+ if (e === "connecting") {
this.broadcastStatus = 0;
- }else{
+ }else if (e === "connected") {
this.broadcastStatus = 1;
+ }else if (e === "disconnected") {
+ this.broadcastStatus = -1;
}
});
this.broadcastRtc.on(ZLMRTCClient.Events.CAPTURE_STREAM_FAILED,(e)=>{// offer anwser 浜ゆ崲澶辫触
@@ -921,6 +932,26 @@
type: 'error'
});
});
+ },
+ stopBroadcast(){
+ this.broadcastStatus = -2;
+ this.broadcastRtc = null;
+ this.$axios({
+ method: 'get',
+ url: '/api/play/broadcast/stop/' + this.deviceId + '/' + this.channelId
+ }).then( (res)=> {
+ if (res.data.code == 0) {
+ // this.broadcastStatus = -1;
+ // this.broadcastRtc.close()
+ }else {
+ this.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+ });
+
}
}
};
--
Gitblit v1.8.0