wvp-pro.git - Gitblit

			@@ -2,7 +2,6 @@
			<div id="devicePlayer" v-loading="isLoging">

			<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="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1">
			<el-tab-pane label="Jessibuca" name="jessibuca">
			@@ -51,93 +50,93 @@
			更多地址<i class="el-icon-arrow-down el-icon--right"></i>
			</el-button>
			<el-dropdown-menu slot="dropdown" >
			<el-dropdown-item :command="streamInfo.flv">
			<el-dropdown-item v-if="streamInfo.flv" :command="streamInfo.flv.url">
			<el-tag >FLV:</el-tag>
			<span>{{ streamInfo.flv }}</span>
			<span>{{ streamInfo.flv.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.https_flv">
			<el-dropdown-item v-if="streamInfo.https_flv" :command="streamInfo.https_flv.url">
			<el-tag >FLV(https):</el-tag>
			<span>{{ streamInfo.https_flv }}</span>
			<span>{{ streamInfo.https_flv.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.ws_flv">
			<el-dropdown-item v-if="streamInfo.ws_flv" :command="streamInfo.ws_flv.url">
			<el-tag >FLV(ws):</el-tag>
			<span >{{ streamInfo.ws_flv }}</span>
			<span >{{ streamInfo.ws_flv.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.wss_flv">
			<el-dropdown-item v-if="streamInfo.wss_flv" :command="streamInfo.wss_flv.url">
			<el-tag >FLV(wss):</el-tag>
			<span>{{ streamInfo.wss_flv }}</span>
			<span>{{ streamInfo.wss_flv.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.fmp4">
			<el-dropdown-item v-if="streamInfo.fmp4" :command="streamInfo.fmp4.url">
			<el-tag >FMP4:</el-tag>
			<span>{{ streamInfo.fmp4 }}</span>
			<span>{{ streamInfo.fmp4.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.https_fmp4">
			<el-dropdown-item v-if="streamInfo.https_fmp4" :command="streamInfo.https_fmp4.url">
			<el-tag >FMP4(https):</el-tag>
			<span>{{ streamInfo.https_fmp4 }}</span>
			<span>{{ streamInfo.https_fmp4.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.ws_fmp4">
			<el-dropdown-item v-if="streamInfo.ws_fmp4" :command="streamInfo.ws_fmp4.url">
			<el-tag >FMP4(ws):</el-tag>
			<span>{{ streamInfo.ws_fmp4 }}</span>
			<span>{{ streamInfo.ws_fmp4.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.wss_fmp4">
			<el-dropdown-item v-if="streamInfo.wss_fmp4" :command="streamInfo.wss_fmp4.url">
			<el-tag >FMP4(wss):</el-tag>
			<span>{{ streamInfo.wss_fmp4 }}</span>
			<span>{{ streamInfo.wss_fmp4.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.hls">
			<el-dropdown-item v-if="streamInfo.hls" :command="streamInfo.hls.url">
			<el-tag>HLS:</el-tag>
			<span>{{ streamInfo.hls }}</span>
			<span>{{ streamInfo.hls.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.https_hls">
			<el-dropdown-item v-if="streamInfo.https_hls" :command="streamInfo.https_hls.url">
			<el-tag >HLS(https):</el-tag>
			<span>{{ streamInfo.https_hls }}</span>
			<span>{{ streamInfo.https_hls.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.ws_hls">
			<el-dropdown-item v-if="streamInfo.ws_hls" :command="streamInfo.ws_hls.url">
			<el-tag >HLS(ws):</el-tag>
			<span>{{ streamInfo.ws_hls }}</span>
			<span>{{ streamInfo.ws_hls.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.wss_hls">
			<el-dropdown-item v-if="streamInfo.wss_hls" :command="streamInfo.wss_hls.url">
			<el-tag >HLS(wss):</el-tag>
			<span>{{ streamInfo.wss_hls }}</span>
			<span>{{ streamInfo.wss_hls.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.ts">
			<el-dropdown-item v-if="streamInfo.ts" :command="streamInfo.ts.url">
			<el-tag>TS:</el-tag>
			<span>{{ streamInfo.ts }}</span>
			<span>{{ streamInfo.ts.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.https_ts">
			<el-dropdown-item v-if="streamInfo.https_ts" :command="streamInfo.https_ts.url">
			<el-tag>TS(https):</el-tag>
			<span>{{ streamInfo.https_ts }}</span>
			<span>{{ streamInfo.https_ts.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.ws_ts">
			<el-dropdown-item v-if="streamInfo.ws_ts" :command="streamInfo.ws_ts.url">
			<el-tag>TS(ws):</el-tag>
			<span>{{ streamInfo.ws_ts }}</span>
			<span>{{ streamInfo.ws_ts.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.wss_ts">
			<el-dropdown-item v-if="streamInfo.wss_ts" :command="streamInfo.wss_ts.url">
			<el-tag>TS(wss):</el-tag>
			<span>{{ streamInfo.wss_ts }}</span>
			<span>{{ streamInfo.wss_ts.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.rtc">
			<el-dropdown-item v-if="streamInfo.rtc" :command="streamInfo.rtc.url">
			<el-tag >RTC:</el-tag>
			<span>{{ streamInfo.rtc }}</span>
			<span>{{ streamInfo.rtc.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.rtcs">
			<el-dropdown-item v-if="streamInfo.rtcs" :command="streamInfo.rtcs.url">
			<el-tag >RTCS:</el-tag>
			<span>{{ streamInfo.rtcs }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.rtmp">
			<el-dropdown-item v-if="streamInfo.rtmp" :command="streamInfo.rtmp.url">
			<el-tag >RTMP:</el-tag>
			<span>{{ streamInfo.rtmp }}</span>
			<span>{{ streamInfo.rtmp.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.rtmps">
			<el-dropdown-item v-if="streamInfo.rtmps" :command="streamInfo.rtmps.url">
			<el-tag >RTMPS:</el-tag>
			<span>{{ streamInfo.rtmps }}</span>
			<span>{{ streamInfo.rtmps.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.rtsp">
			<el-dropdown-item v-if="streamInfo.rtsp" :command="streamInfo.rtsp.url">
			<el-tag >RTSP:</el-tag>
			<span>{{ streamInfo.rtsp }}</span>
			<span>{{ streamInfo.rtsp.url }}</span>
			</el-dropdown-item>
			<el-dropdown-item :command="streamInfo.rtsps">
			<el-dropdown-item v-if="streamInfo.rtsps" :command="streamInfo.rtsps.url">
			<el-tag >RTSPS:</el-tag>
			<span>{{ streamInfo.rtsps }}</span>
			<span>{{ streamInfo.rtsps.url }}</span>
			</el-dropdown-item>
			</el-dropdown-menu>
			</el-dropdown>
			@@ -280,7 +279,7 @@
			</div>

			</el-tab-pane>
			<el-tab-pane label="语音对讲" name="broadcast" >
			<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>
			@@ -303,15 +302,13 @@
			<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'
			import recordDownload from '../dialog/recordDownload.vue'
			export default {
			name: 'devicePlayer',
			props: {},
			components: {
			jessibucaPlayer, rtcPlayer, recordDownload,
			jessibucaPlayer, rtcPlayer, recordDownload,
			},
			computed: {
			getPlayerShared: function () {
			@@ -411,7 +408,7 @@
			changePlayer: function (tab) {
			console.log(this.player[tab.name][0])
			this.activePlayer = tab.name;
			this.videoUrl = this.streamInfo[this.player[tab.name][0]]
			this.videoUrl = this.getUrlByStreamInfo()
			console.log(this.videoUrl)
			},
			openDialog: function (tab, deviceId, channelId, param) {
			@@ -464,9 +461,9 @@
			getUrlByStreamInfo(){
			console.log(this.streamInfo)
			if (location.protocol === "https:") {
			this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
			this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]].url
			}else {
			this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]]
			this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]].url
			}
			return this.videoUrl;

			@@ -857,7 +854,7 @@
			if (this.broadcastStatus == -1) {
			// 默认状态，开始
			this.broadcastStatus = 0
			// 发起语音对讲
			// 发起语音喊话
			this.$axios({
			method: 'get',
			url: '/api/play/broadcast/' + this.deviceId + '/' + this.channelId + "?timeout=30"
			@@ -865,9 +862,9 @@
			if (res.data.code == 0) {
			let streamInfo = res.data.data.streamInfo;
			if (document.location.protocol.includes("https")) {
			this.startBroadcast(streamInfo.rtcs)
			this.startBroadcast(streamInfo.rtcs.url)
			}else {
			this.startBroadcast(streamInfo.rtc)
			this.startBroadcast(streamInfo.rtc.url)
			}

			}else {
			@@ -900,7 +897,7 @@
			let pushKey = res.data.data.pushKey;
			// 获取推流鉴权KEY
			url += "&sign=" + crypto.createHash('md5').update(pushKey, "utf8").digest('hex')
			console.log("开始语音对讲： " + url)
			console.log("开始语音喊话： " + url)
			this.broadcastRtc = new ZLMRTCClient.Endpoint({
			debug: true, // 是否打印日志
			zlmsdpUrl: url, //流地址
			@@ -926,7 +923,7 @@
			console.error('不支持webrtc',e)
			this.$message({
			showClose: true,
			message: '不支持webrtc, 无法进行语音对讲',
			message: '不支持webrtc, 无法进行语音喊话',
			type: 'error'
			});
			this.broadcastStatus = -1;