From 8b0ff3767b23f9479a0b3ebe8e343ed6470bd194 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 八月 2022 14:41:21 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/dialog/devicePlayer.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index a33e8a4..ba02441 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>
@@ -371,7 +372,7 @@
showTimeText: "00:00:00",
streamInfo: null,
broadcastRtc: null,
- broadcastStatus: -1, // -1 榛樿鐘舵�� 0 绛夊緟鎺ラ�� 1 鎺ラ�氭垚鍔�
+ broadcastStatus: -1, // -2 姝ｅ湪閲婃斁璧勬簮 -1 榛樿鐘舵�� 0 绛夊緟鎺ラ�� 1 鎺ラ�氭垚鍔�
};
},
methods: {
@@ -387,7 +388,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;
@@ -821,6 +822,9 @@
});
},
getBroadcastStatus() {
+ if (this.broadcastStatus == -2) {
+ return "primary"
+ }
if (this.broadcastStatus == -1) {
return "primary"
}
@@ -835,6 +839,7 @@
broadcastStatusClick() {
if (this.broadcastStatus == -1) {
// 榛樿鐘舵�侊紝 寮�濮�
+ this.broadcastStatus = 0
// 鍙戣捣璇煶瀵硅
this.$axios({
method: 'get',
@@ -910,7 +915,7 @@
this.broadcastStatus = 0;
}else if (e === "connected") {
this.broadcastStatus = 1;
- }else {
+ }else if (e === "disconnected") {
this.broadcastStatus = -1;
}
});
@@ -924,7 +929,7 @@
});
},
stopBroadcast(){
- this.broadcastRtc.close()
+ this.broadcastStatus = -2;
this.broadcastRtc = null;
this.$axios({
method: 'get',
@@ -932,7 +937,7 @@
}).then( (res)=> {
if (res.data.code == 0) {
// this.broadcastStatus = -1;
-
+ // this.broadcastRtc.close()
}else {
this.$message({
showClose: true,
--
Gitblit v1.8.0