From 82fd369ce554467f794c9aa66e453adecefc73a9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 16:56:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
web_src/src/components/dialog/devicePlayer.vue | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 215 insertions(+), 15 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 4d4dbef..4c8f264 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -4,7 +4,7 @@
<el-dialog title="瑙嗛鎾斁" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()">
<!-- <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasaudio" fluent autoplay live></LivePlayer> -->
<div style="width: 100%; height: 100%">
- <el-tabs type="border-card" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1">
+ <el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1">
<el-tab-pane label="Jessibuca" name="jessibuca">
<jessibucaPlayer v-if="activePlayer === 'jessibuca'" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer>
</el-tab-pane>
@@ -118,6 +118,10 @@
<el-dropdown-item :command="streamInfo.rtc">
<el-tag >RTC:</el-tag>
<span>{{ streamInfo.rtc }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtcs">
+ <el-tag >RTCS:</el-tag>
+ <span>{{ streamInfo.rtcs }}</span>
</el-dropdown-item>
<el-dropdown-item :command="streamInfo.rtmp">
<el-tag >RTMP:</el-tag>
@@ -276,6 +280,18 @@
</div>
</el-tab-pane>
+ <el-tab-pane label="璇煶瀵硅" name="broadcast" >
+ <div class="trank" style="text-align: center;">
+ <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>
+ </p>
+
+ </div>
+ </el-tab-pane>
</el-tabs>
</div>
@@ -286,6 +302,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'
@@ -305,7 +322,14 @@
};
}
},
- created() {},
+ created() {
+ console.log("created")
+ console.log(this.player)
+ this.broadcastStatus = -1;
+ if (Object.keys(this.player).length === 1) {
+ this.activePlayer = Object.keys(this.player)[0]
+ }
+ },
data() {
return {
video: 'http://lndxyj.iqilu.com/public/upload/2019/10/14/8c001ea0c09cdc59a57829dabc8010fa.mp4',
@@ -314,7 +338,7 @@
// 濡備綍浣犲彧鏄敤涓�绉嶆挱鏀惧櫒锛岀洿鎺ユ敞閲婃帀涓嶇敤鐨勯儴鍒嗗嵆鍙�
player: {
jessibuca : ["ws_flv", "wss_flv"],
- webRTC: ["rtc", "rtc"],
+ webRTC: ["rtc", "rtcs"],
},
videoHistory: {
date: '',
@@ -354,6 +378,8 @@
recordStartTime: 0,
showTimeText: "00:00:00",
streamInfo: null,
+ broadcastRtc: null,
+ broadcastStatus: -1, // -2 姝ｅ湪閲婃斁璧勬簮 -1 榛樿鐘舵�� 0 绛夊緟鎺ラ�� 1 鎺ラ�氭垚鍔�
};
},
methods: {
@@ -366,10 +392,10 @@
if (tab.name === "codec") {
this.$axios({
method: 'get',
- url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId
+ url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtsp&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;
@@ -389,6 +415,9 @@
console.log(this.videoUrl)
},
openDialog: function (tab, deviceId, channelId, param) {
+ if (this.showVideoDialog) {
+ return;
+ }
this.tabActiveName = tab;
this.channelId = channelId;
this.deviceId = deviceId;
@@ -433,6 +462,7 @@
this.playFromStreamInfo(false, streamInfo)
},
getUrlByStreamInfo(){
+ console.log(this.streamInfo)
if (location.protocol === "https:") {
this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
}else {
@@ -447,9 +477,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;
@@ -519,6 +549,7 @@
this.stopPlayRecord();
}
this.recordPlay = ''
+ this.stopBroadcast()
},
copySharedInfo: function (data) {
@@ -558,10 +589,10 @@
url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
}).then(function (res) {
console.log(res)
+ that.recordsLoading = false;
if(res.data.code === 0) {
// 澶勭悊鏃堕棿淇℃伅
that.videoHistory.searchHistoryResult = res.data.data.recordList;
- that.recordsLoading = false;
}else {
this.$message({
showClose: true,
@@ -600,13 +631,21 @@
url: '/api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
row.endTime
}).then(function (res) {
- var streamInfo = res.data;
- that.app = streamInfo.app;
- that.streamId = streamInfo.stream;
- that.mediaServerId = streamInfo.mediaServerId;
- that.ssrc = streamInfo.ssrc;
- that.videoUrl = that.getUrlByStreamInfo(streamInfo);
- that.recordPlay = true;
+ 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();
+ }else {
+ that.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+ that.recordPlay = true;
});
}
},
@@ -799,8 +838,169 @@
}, 600)
});
},
+ getBroadcastStatus() {
+ if (this.broadcastStatus == -2) {
+ return "primary"
+ }
+ if (this.broadcastStatus == -1) {
+ return "primary"
+ }
+ if (this.broadcastStatus == 0) {
+ return "warning"
+ }
+ if (this.broadcastStatus == 1) {
+ return "danger"
+ }
+
+ },
+ broadcastStatusClick() {
+ if (this.broadcastStatus == -1) {
+ // 榛樿鐘舵�侊紝 寮�濮�
+ this.broadcastStatus = 0
+ // 鍙戣捣璇煶瀵硅
+ this.$axios({
+ method: 'get',
+ url: '/api/play/broadcast/' + this.deviceId + '/' + this.channelId + "?timeout=30"
+ }).then( (res)=> {
+ if (res.data.code == 0) {
+ let streamInfo = res.data.data.streamInfo;
+ if (document.location.protocol.includes("https")) {
+ this.startBroadcast(streamInfo.rtcs)
+ }else {
+ this.startBroadcast(streamInfo.rtc)
+ }
+
+ }else {
+ this.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+ });
+ }else if (this.broadcastStatus === 1) {
+ this.broadcastStatus = -1;
+ this.broadcastRtc.close()
+ }
+ },
+ startBroadcast(url){
+ // 鑾峰彇鎺ㄦ祦閴存潈Key
+ this.$axios({
+ method: 'post',
+ url: '/api/user/userInfo',
+ }).then( (res)=> {
+ if (res.data.code !== 0) {
+ this.$message({
+ showClose: true,
+ message: "鑾峰彇鎺ㄦ祦閴存潈Key澶辫触",
+ type: "error",
+ });
+ this.broadcastStatus = -1;
+ }else {
+ let pushKey = res.data.data.pushKey;
+ // 鑾峰彇鎺ㄦ祦閴存潈KEY
+ url += "&sign=" + crypto.createHash('md5').update(pushKey, "utf8").digest('hex')
+ console.log("寮�濮嬭闊冲璁诧細 " + url)
+ this.broadcastRtc = new ZLMRTCClient.Endpoint({
+ debug: true, // 鏄惁鎵撳嵃鏃ュ織
+ zlmsdpUrl: url, //娴佸湴鍧�
+ simulecast: false,
+ useCamera: false,
+ audioEnable: true,
+ videoEnable: false,
+ recvOnly: false,
+ })
+
+ // webrtcPlayer.on(ZLMRTCClient.Events.WEBRTC_ON_REMOTE_STREAMS,(e)=>{//鑾峰彇鍒颁簡杩滅娴侊紝鍙互鎾斁
+ // console.error('鎾斁鎴愬姛',e.streams)
+ // this.broadcastStatus = 1;
+ // });
+ //
+ // webrtcPlayer.on(ZLMRTCClient.Events.WEBRTC_ON_LOCAL_STREAM,(s)=>{// 鑾峰彇鍒颁簡鏈湴娴�
+ // this.broadcastStatus = 1;
+ // // document.getElementById('selfVideo').srcObject=s;
+ // // this.eventcallbacK("LOCAL STREAM", "鑾峰彇鍒颁簡鏈湴娴�")
+ // });
+
+ this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_NOT_SUPPORT,(e)=>{// 鑾峰彇鍒颁簡鏈湴娴�
+ console.error('涓嶆敮鎸亀ebrtc',e)
+ this.$message({
+ showClose: true,
+ message: '涓嶆敮鎸亀ebrtc, 鏃犳硶杩涜璇煶瀵硅',
+ type: 'error'
+ });
+ this.broadcastStatus = -1;
+ });
+
+ this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR,(e)=>{// ICE 鍗忓晢鍑洪敊
+ console.error('ICE 鍗忓晢鍑洪敊')
+ this.$message({
+ showClose: true,
+ message: 'ICE 鍗忓晢鍑洪敊',
+ type: 'error'
+ });
+ this.broadcastStatus = -1;
+ });
+
+ this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED,(e)=>{// offer anwser 浜ゆ崲澶辫触
+ console.error('offer anwser 浜ゆ崲澶辫触',e)
+ this.$message({
+ showClose: true,
+ message: 'offer anwser 浜ゆ崲澶辫触' + e,
+ type: 'error'
+ });
+ this.broadcastStatus = -1;
+ });
+ this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ON_CONNECTION_STATE_CHANGE,(e)=>{// offer anwser 浜ゆ崲澶辫触
+ console.log('鐘舵�佹敼鍙�',e)
+ if (e === "connecting") {
+ this.broadcastStatus = 0;
+ }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 浜ゆ崲澶辫触
+ console.log('鎹曡幏娴佸け璐�',e)
+ this.$message({
+ showClose: true,
+ message: '鎹曡幏娴佸け璐�' + e,
+ type: 'error'
+ });
+ this.broadcastStatus = -1;
+ });
+ }
+ }).catch((e) => {
+ this.$message({
+ showClose: true,
+ message: e,
+ type: 'error'
+ });
+ this.broadcastStatus = -1;
+ });
+ },
+ stopBroadcast(){
+ this.broadcastRtc.close();
+ this.broadcastStatus = -1;
+ 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",
+ });
+ }
+ });
+ }
}
};
</script>
--
Gitblit v1.8.0