From a6fb1cdb74ca11c9dba798e64bf3d61bbfbdf05b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 11 九月 2023 16:17:29 +0800
Subject: [PATCH] 修复Web页面播放国标录像无声音的问题
---
web_src/src/components/dialog/devicePlayer.vue | 437 ++++++++++++++++++++++++++++++------------------------
1 files changed, 243 insertions(+), 194 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
old mode 100644
new mode 100755
index 48d295a..9e4eea0
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -1,116 +1,218 @@
<template>
<div id="devicePlayer" v-loading="isLoging">
- <el-dialog title="瑙嗛鎾斁" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" :destroy-on-close="true" @close="close()">
- <!-- <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasaudio" fluent autoplay live></LivePlayer> -->
- <player ref="videoPlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasaudio" fluent autoplay live></player>
+ <el-dialog title="瑙嗛鎾斁" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()">
+ <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="LivePlayer" name="livePlayer">-->
+<!-- <LivePlayer v-if="showVideoDialog" ref="livePlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasAudio" fluent autoplay live></LivePlayer>-->
+<!-- </el-tab-pane>-->
+ <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>
+ <el-tab-pane label="WebRTC" name="webRTC">
+ <rtc-player v-if="activePlayer === 'webRTC'" ref="webRTC" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></rtc-player>
+ </el-tab-pane>
+ <el-tab-pane label="h265web">h265web鏁鏈熷緟</el-tab-pane>
+ </el-tabs>
+ <jessibucaPlayer v-if="Object.keys(this.player).length == 1 && this.player.jessibuca" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer>
+ <rtc-player v-if="Object.keys(this.player).length == 1 && this.player.webRTC" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></rtc-player>
+
+ </div>
<div id="shared" style="text-align: right; margin-top: 1rem;">
- <el-tabs v-model="tabActiveName" @tab-click="tabHandleClick">
+ <el-tabs v-model="tabActiveName" @tab-click="tabHandleClick" >
<el-tab-pane label="瀹炴椂瑙嗛" name="media">
- <div style="margin-bottom: 0.5rem;">
- <!-- <el-button type="primary" size="small" @click="playRecord(true, '')">鎾斁</el-button>-->
- <!-- <el-button type="primary" size="small" @click="startRecord()">褰曞埗</el-button>-->
- <!-- <el-button type="primary" size="small" @click="stopRecord()">鍋滄褰曞埗</el-button>-->
- </div>
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">鎾斁鍦板潃锛�</span>
- <el-input v-model="getPlayerShared.sharedUrl" :disabled="true" v-on:click.native="copySharedInfo(getPlayerShared.sharedUrl)"></el-input>
+ <el-input v-model="getPlayerShared.sharedUrl" :disabled="true" >
+ <template slot="append">
+ <i class="cpoy-btn el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="getPlayerShared.sharedUrl" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></i>
+ </template>
+ </el-input>
</div>
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">iframe锛�</span>
- <el-input v-model="getPlayerShared.sharedIframe" :disabled="true" v-on:click.native="copySharedInfo(getPlayerShared.sharedIframe)"></el-input>
+ <el-input v-model="getPlayerShared.sharedIframe" :disabled="true" >
+ <template slot="append">
+ <i class="cpoy-btn el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="getPlayerShared.sharedIframe" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></i>
+ </template>
+ </el-input>
</div>
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">璧勬簮鍦板潃锛�</span>
- <el-input v-model="getPlayerShared.sharedRtmp" :disabled="true" v-on:click.native="copySharedInfo(getPlayerShared.sharedRtmp)"></el-input>
+ <el-input v-model="getPlayerShared.sharedRtmp" :disabled="true" >
+ <el-button slot="append" icon="el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="getPlayerShared.sharedRtmp" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></el-button>
+ <el-dropdown slot="prepend" v-if="streamInfo" trigger="click" @command="copyUrl">
+ <el-button >
+ 鏇村鍦板潃<i class="el-icon-arrow-down el-icon--right"></i>
+ </el-button>
+ <el-dropdown-menu slot="dropdown" >
+ <el-dropdown-item v-if="streamInfo.flv" :command="streamInfo.flv">
+ <el-tag >FLV:</el-tag>
+ <span>{{ streamInfo.flv }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.https_flv" :command="streamInfo.https_flv">
+ <el-tag >FLV(https):</el-tag>
+ <span>{{ streamInfo.https_flv }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.ws_flv" :command="streamInfo.ws_flv">
+ <el-tag >FLV(ws):</el-tag>
+ <span >{{ streamInfo.ws_flv }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.wss_flv" :command="streamInfo.wss_flv">
+ <el-tag >FLV(wss):</el-tag>
+ <span>{{ streamInfo.wss_flv }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.fmp4" :command="streamInfo.fmp4">
+ <el-tag >FMP4:</el-tag>
+ <span>{{ streamInfo.fmp4 }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.https_fmp4" :command="streamInfo.https_fmp4">
+ <el-tag >FMP4(https):</el-tag>
+ <span>{{ streamInfo.https_fmp4 }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.ws_fmp4" :command="streamInfo.ws_fmp4">
+ <el-tag >FMP4(ws):</el-tag>
+ <span>{{ streamInfo.ws_fmp4 }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.wss_fmp4" :command="streamInfo.wss_fmp4">
+ <el-tag >FMP4(wss):</el-tag>
+ <span>{{ streamInfo.wss_fmp4 }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.hls" :command="streamInfo.hls">
+ <el-tag>HLS:</el-tag>
+ <span>{{ streamInfo.hls }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.https_hls" :command="streamInfo.https_hls">
+ <el-tag >HLS(https):</el-tag>
+ <span>{{ streamInfo.https_hls }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.ws_hls" :command="streamInfo.ws_hls">
+ <el-tag >HLS(ws):</el-tag>
+ <span>{{ streamInfo.ws_hls }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.wss_hls" :command="streamInfo.wss_hls">
+ <el-tag >HLS(wss):</el-tag>
+ <span>{{ streamInfo.wss_hls }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.ts" :command="streamInfo.ts">
+ <el-tag>TS:</el-tag>
+ <span>{{ streamInfo.ts }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.https_ts" :command="streamInfo.https_ts">
+ <el-tag>TS(https):</el-tag>
+ <span>{{ streamInfo.https_ts }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.ws_ts" :command="streamInfo.ws_ts">
+ <el-tag>TS(ws):</el-tag>
+ <span>{{ streamInfo.ws_ts }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.wss_ts" :command="streamInfo.wss_ts">
+ <el-tag>TS(wss):</el-tag>
+ <span>{{ streamInfo.wss_ts }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.rtc" :command="streamInfo.rtc">
+ <el-tag >RTC:</el-tag>
+ <span>{{ streamInfo.rtc }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.rtcs" :command="streamInfo.rtcs">
+ <el-tag >RTCS:</el-tag>
+ <span>{{ streamInfo.rtcs }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.rtmp" :command="streamInfo.rtmp">
+ <el-tag >RTMP:</el-tag>
+ <span>{{ streamInfo.rtmp }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.rtmps" :command="streamInfo.rtmps">
+ <el-tag >RTMPS:</el-tag>
+ <span>{{ streamInfo.rtmps }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.rtsp" :command="streamInfo.rtsp">
+ <el-tag >RTSP:</el-tag>
+ <span>{{ streamInfo.rtsp }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item v-if="streamInfo.rtsps" :command="streamInfo.rtsps">
+ <el-tag >RTSPS:</el-tag>
+ <span>{{ streamInfo.rtsps }}</span>
+ </el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+ </el-input>
+
</div>
</el-tab-pane>
<!--{"code":0,"data":{"paths":["22-29-30.mp4"],"rootPath":"/home/kkkkk/Documents/ZLMediaKit/release/linux/Debug/www/record/hls/kkkkk/2020-05-11/"}}-->
- <el-tab-pane label="褰曞儚鏌ヨ" name="record" v-if="showRrecord">
- <el-date-picker size="mini" v-model="videoHistory.date" type="date" value-format="yyyy-MM-dd" placeholder="鏃ユ湡" @change="queryRecords()"></el-date-picker>
- <el-table :data="videoHistory.searchHistoryResult" height="150" v-loading="recordsLoading">
- <el-table-column label="鍚嶇О" prop="name"></el-table-column>
- <el-table-column label="鏂囦欢" prop="filePath"></el-table-column>
- <el-table-column label="寮�濮嬫椂闂�" prop="startTime" :formatter="timeFormatter"></el-table-column>
- <el-table-column label="缁撴潫鏃堕棿" prop="endTime" :formatter="timeFormatter"></el-table-column>
-
- <el-table-column label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button icon="el-icon-video-play" size="mini" @click="playRecord(scope.row)">鎾斁</el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-tab-pane>
<!--閬ユ帶鐣岄潰-->
<el-tab-pane label="浜戝彴鎺у埗" name="control" v-if="showPtz">
<div style="display: flex; justify-content: left;">
<div class="control-wrapper">
- <div class="control-btn control-top" @mousedown="ptzCamera(0, 2, 0)" @mouseup="ptzCamera(0, 0, 0)">
+ <div class="control-btn control-top" @mousedown="ptzCamera('up')" @mouseup="ptzCamera('stop')">
<i class="el-icon-caret-top"></i>
<div class="control-inner-btn control-inner"></div>
</div>
- <div class="control-btn control-left" @mousedown="ptzCamera(2, 0, 0)" @mouseup="ptzCamera(0, 0, 0)">
+ <div class="control-btn control-left" @mousedown="ptzCamera('left')" @mouseup="ptzCamera('stop')">
<i class="el-icon-caret-left"></i>
<div class="control-inner-btn control-inner"></div>
</div>
- <div class="control-btn control-bottom" @mousedown="ptzCamera(0, 1, 0)" @mouseup="ptzCamera(0, 0, 0)">
+ <div class="control-btn control-bottom" @mousedown="ptzCamera('down')" @mouseup="ptzCamera('stop')">
<i class="el-icon-caret-bottom"></i>
<div class="control-inner-btn control-inner"></div>
</div>
- <div class="control-btn control-right" @mousedown="ptzCamera(1, 0, 0)" @mouseup="ptzCamera(0, 0, 0)">
+ <div class="control-btn control-right" @mousedown="ptzCamera('right')" @mouseup="ptzCamera('stop')">
<i class="el-icon-caret-right"></i>
<div class="control-inner-btn control-inner"></div>
</div>
<div class="control-round">
<div class="control-round-inner"><i class="fa fa-pause-circle"></i></div>
</div>
- <div style="position: absolute; left: 7.25rem; top: 1.25rem" @mousedown="ptzCamera(0, 0, 1)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-in control-zoom-btn" style="font-size: 1.875rem;"></i></div>
- <div style="position: absolute; left: 7.25rem; top: 3.25rem; font-size: 1.875rem;" @mousedown="ptzCamera(0, 0, 2)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-out control-zoom-btn"></i></div>
+ <div style="position: absolute; left: 7.25rem; top: 1.25rem" @mousedown="ptzCamera('zoomin')" @mouseup="ptzCamera('stop')"><i class="el-icon-zoom-in control-zoom-btn" style="font-size: 1.875rem;"></i></div>
+ <div style="position: absolute; left: 7.25rem; top: 3.25rem; font-size: 1.875rem;" @mousedown="ptzCamera('zoomout')" @mouseup="ptzCamera('stop')"><i class="el-icon-zoom-out control-zoom-btn"></i></div>
<div class="contro-speed" style="position: absolute; left: 4px; top: 7rem; width: 9rem;">
<el-slider v-model="controSpeed" :max="255"></el-slider>
</div>
</div>
-
+
<div class="control-panel">
<el-button-group>
- <el-tag style="position :absolute; left: 0rem; top: 0rem; width: 5rem; text-align: center" size="medium" type="info">棰勭疆浣嶇紪鍙�</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 0rem; width: 5rem; text-align: center" size="medium">棰勭疆浣嶇紪鍙�</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 0rem; width: 6rem" size="mini" v-model="presetPos" controls-position="right" :precision="0" :step="1" :min="1" :max="255"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 0rem; width: 5rem" size="mini" icon="el-icon-add-location" @click="presetPosition(129, presetPos)">璁剧疆</el-button>
<el-button style="position: absolute; left: 27rem; top: 0rem; width: 5rem" size="mini" type="primary" icon="el-icon-place" @click="presetPosition(130, presetPos)">璋冪敤</el-button>
<el-button style="position: absolute; left: 16rem; top: 0rem; width: 5rem" size="mini" icon="el-icon-delete-location" @click="presetPosition(131, presetPos)">鍒犻櫎</el-button>
- <el-tag style="position :absolute; left: 0rem; top: 2.5rem; width: 5rem; text-align: center" size="medium" type="info">宸¤埅閫熷害</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 2.5rem; width: 5rem; text-align: center" size="medium">宸¤埅閫熷害</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 2.5rem; width: 6rem" size="mini" v-model="cruisingSpeed" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 2.5rem; width: 5rem" size="mini" icon="el-icon-loading" @click="setSpeedOrTime(134, cruisingGroup, cruisingSpeed)">璁剧疆</el-button>
- <el-tag style="position :absolute; left: 16rem; top: 2.5rem; width: 5rem; text-align: center" size="medium" type="info">鍋滅暀鏃堕棿</el-tag>
+ <el-tag style="position :absolute; left: 16rem; top: 2.5rem; width: 5rem; text-align: center" size="medium">鍋滅暀鏃堕棿</el-tag>
<el-input-number style="position: absolute; left: 21rem; top: 2.5rem; width: 6rem" size="mini" v-model="cruisingTime" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
<el-button style="position: absolute; left: 27rem; top: 2.5rem; width: 5rem" size="mini" icon="el-icon-timer" @click="setSpeedOrTime(135, cruisingGroup, cruisingTime)">璁剧疆</el-button>
- <el-tag style="position :absolute; left: 0rem; top: 4.5rem; width: 5rem; text-align: center" size="medium" type="info">宸¤埅缁勭紪鍙�</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 4.5rem; width: 5rem; text-align: center" size="medium">宸¤埅缁勭紪鍙�</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 4.5rem; width: 6rem" size="mini" v-model="cruisingGroup" controls-position="right" :precision="0" :min="0" :max="255"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 4.5rem; width: 5rem" size="mini" icon="el-icon-add-location" @click="setCommand(132, cruisingGroup, presetPos)">娣诲姞鐐�</el-button>
<el-button style="position: absolute; left: 16rem; top: 4.5rem; width: 5rem" size="mini" icon="el-icon-delete-location" @click="setCommand(133, cruisingGroup, presetPos)">鍒犻櫎鐐�</el-button>
<el-button style="position: absolute; left: 21rem; top: 4.5rem; width: 5rem" size="mini" icon="el-icon-delete" @click="setCommand(133, cruisingGroup, 0)">鍒犻櫎缁�</el-button>
<el-button style="position: absolute; left: 27rem; top: 5rem; width: 5rem" size="mini" type="primary" icon="el-icon-video-camera-solid" @click="setCommand(136, cruisingGroup, 0)">宸¤埅</el-button>
- <el-tag style="position :absolute; left: 0rem; top: 7rem; width: 5rem; text-align: center" size="medium" type="info">鎵弿閫熷害</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 7rem; width: 5rem; text-align: center" size="medium">鎵弿閫熷害</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 7rem; width: 6rem" size="mini" v-model="scanSpeed" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 7rem; width: 5rem" size="mini" icon="el-icon-loading" @click="setSpeedOrTime(138, scanGroup, scanSpeed)">璁剧疆</el-button>
- <el-tag style="position :absolute; left: 0rem; top: 9rem; width: 5rem; text-align: center" size="medium" type="info">鎵弿缁勭紪鍙�</el-tag>
+ <el-tag style="position :absolute; left: 0rem; top: 9rem; width: 5rem; text-align: center" size="medium">鎵弿缁勭紪鍙�</el-tag>
<el-input-number style="position: absolute; left: 5rem; top: 9rem; width: 6rem" size="mini" v-model="scanGroup" controls-position="right" :precision="0" :step="1" :min="0" :max="255"></el-input-number>
<el-button style="position: absolute; left: 11rem; top: 9rem; width: 5rem" size="mini" icon="el-icon-d-arrow-left" @click="setCommand(137, scanGroup, 1)">宸﹁竟鐣�</el-button>
<el-button style="position: absolute; left: 16rem; top: 9rem; width: 5rem" size="mini" icon="el-icon-d-arrow-right" @click="setCommand(137, scanGroup, 2)">鍙宠竟鐣�</el-button>
<el-button style="position: absolute; left: 27rem; top: 7rem; width: 5rem" size="mini" type="primary" icon="el-icon-video-camera-solid" @click="setCommand(137, scanGroup, 0)">鎵弿</el-button>
- <el-button style="position: absolute; left: 27rem; top: 9rem; width: 5rem" size="mini" type="danger" icon="el-icon-switch-button" @click="ptzCamera(0, 0, 0)">鍋滄</el-button>
+ <el-button style="position: absolute; left: 27rem; top: 9rem; width: 5rem" size="mini" type="danger" icon="el-icon-switch-button" @click="ptzCamera('stop')">鍋滄</el-button>
</el-button-group>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="缂栫爜淇℃伅" name="codec" v-loading="tracksLoading">
<p>
- 鏃犳硶鎾斁鎴栬�呮病鏈夊０闊�?   璇曚竴璇�
+ 鏃犳硶鎾斁鎴栬�呮病鏈夊０闊�?   璇曚竴璇� 
<el-button size="mini" type="primary" v-if="!coverPlaying" @click="coverPlay">杞爜鎾斁</el-button>
<el-button size="mini" type="danger" v-if="coverPlaying" @click="convertStopClick">鍋滄杞爜</el-button>
</p>
<div class="trank" >
- <div v-for="(item, index) in tracks">
+ <p v-if="tracksNotLoaded" style="text-align: center;padding-top: 3rem;">鏆傛棤鏁版嵁</p>
+ <div v-for="(item, index) in tracks" style="width: 50%; float: left" loading>
<span >娴� {{index}}</span>
<div class="trankInfo" v-if="item.codec_type == 0">
<p>鏍煎紡: {{item.codec_id_name}}</p>
@@ -129,6 +231,7 @@
</div>
</el-tab-pane>
+
</el-tabs>
</div>
</el-dialog>
@@ -136,38 +239,50 @@
</template>
<script>
-import player from '../dialog/player.vue'
+import rtcPlayer from '../dialog/rtcPlayer.vue'
+import LivePlayer from '@liveqing/liveplayer'
+import jessibucaPlayer from '../common/jessibuca.vue'
export default {
name: 'devicePlayer',
props: {},
components: {
- player,
+ LivePlayer, jessibucaPlayer, rtcPlayer,
},
computed: {
getPlayerShared: function () {
return {
- sharedUrl: window.location.host + '/' + this.videoUrl,
- sharedIframe: '<iframe src="' + window.location.host + '/' + this.videoUrl + '"></iframe>',
+ sharedUrl: window.location.origin + '/#/play/wasm/' + encodeURIComponent(this.videoUrl),
+ sharedIframe: '<iframe src="' + window.location.origin + '/#/play/wasm/' + encodeURIComponent(this.videoUrl) + '"></iframe>',
sharedRtmp: this.videoUrl
};
}
},
- created() {},
+ created() {
+ console.log(this.player)
+ 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',
videoUrl: '',
- videoHistory: {
- date: '',
- searchHistoryResult: [] //濯掍綋娴佸巻鍙茶褰曟悳绱㈢粨鏋�
+ activePlayer: "jessibuca",
+ // 濡備綍浣犲彧鏄敤涓�绉嶆挱鏀惧櫒锛岀洿鎺ユ敞閲婃帀涓嶇敤鐨勯儴鍒嗗嵆鍙�
+ player: {
+ jessibuca : ["ws_flv", "wss_flv"],
+ livePlayer : ["ws_flv", "wss_flv"],
+ webRTC: ["rtc", "rtcs"],
},
showVideoDialog: false,
streamId: '',
+ app : '',
+ mediaServerId : '',
convertKey: '',
deviceId: '',
channelId: '',
tabActiveName: 'media',
- hasaudio: false,
+ hasAudio: false,
loadingRecords: false,
recordsLoading: false,
isLoging: false,
@@ -184,9 +299,14 @@
tracks: [],
coverPlaying:false,
tracksLoading: false,
- recordPlay: "",
showPtz: true,
showRrecord: true,
+ tracksNotLoaded: false,
+ sliderTime: 0,
+ seekTime: 0,
+ recordStartTime: 0,
+ showTimeText: "00:00:00",
+ streamInfo: null,
};
},
methods: {
@@ -195,15 +315,17 @@
var that = this;
that.tracks = [];
that.tracksLoading = true;
- if (tab.name == "codec") {
+ that.tracksNotLoaded = false;
+ if (tab.name === "codec") {
this.$axios({
method: 'get',
- url: '/zlm/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app=rtp&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;
that.$message({
showClose: true,
message: '鑾峰彇缂栫爜淇℃伅澶辫触,',
@@ -213,54 +335,70 @@
}).catch(function (e) {});
}
},
+ changePlayer: function (tab) {
+ console.log(this.player[tab.name][0])
+ this.activePlayer = tab.name;
+ this.videoUrl = this.getUrlByStreamInfo()
+ console.log(this.videoUrl)
+ },
openDialog: function (tab, deviceId, channelId, param) {
+ if (this.showVideoDialog) {
+ return;
+ }
this.tabActiveName = tab;
this.channelId = channelId;
this.deviceId = deviceId;
this.streamId = "";
+ this.mediaServerId = "";
+ this.app = "";
this.videoUrl = ""
- if (!!this.$refs.videoPlayer) {
- this.$refs.videoPlayer.pause();
+ if (!!this.$refs[this.activePlayer]) {
+ this.$refs[this.activePlayer].pause();
}
switch (tab) {
case "media":
this.play(param.streamInfo, param.hasAudio)
break;
- case "record":
- this.showVideoDialog = true;
-
- this.videoHistory.date = param.date;
- this.queryRecords()
- break;
case "streamPlay":
- this.showRrecord = false,
- this.showPtz = false,
+ this.tabActiveName = "media";
+ this.showRrecord = false;
+ this.showPtz = false;
this.play(param.streamInfo, param.hasAudio)
break;
case "control":
break;
}
},
- timeAxisSelTime: function (val) {
- console.log(val)
- },
play: function (streamInfo, hasAudio) {
-
- this.hasaudio = hasAudio;
+ this.streamInfo = streamInfo;
+ this.hasAudio = hasAudio;
this.isLoging = false;
- this.videoUrl = streamInfo.ws_flv;
- this.streamId = streamInfo.streamId;
+ // this.videoUrl = streamInfo.rtc;
+ this.videoUrl = this.getUrlByStreamInfo();
+ this.streamId = streamInfo.stream;
+ this.app = streamInfo.app;
+ this.mediaServerId = streamInfo.mediaServerId;
this.playFromStreamInfo(false, streamInfo)
+ },
+ getUrlByStreamInfo(){
+ console.log(this.streamInfo)
+ if (location.protocol === "https:") {
+ this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
+ }else {
+ this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]]
+ }
+ return this.videoUrl;
+
},
coverPlay: function () {
var that = this;
this.coverPlaying = true;
- this.$refs.videoPlayer.pause()
+ this.$refs[this.activePlayer].pause()
that.$axios({
method: 'post',
- url: '/api/play/' + that.streamId + '/convert'
+ 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;
@@ -287,7 +425,7 @@
},
convertStopClick: function() {
this.convertStop(()=>{
- this.$refs.videoPlayer.play(this.videoUrl)
+ this.$refs[this.activePlayer].play(this.videoUrl)
});
},
convertStop: function(callback) {
@@ -295,7 +433,7 @@
that.$refs.videoPlayer.pause()
this.$axios({
method: 'post',
- url: '/api/play/convert/stop/' + this.convertKey
+ url: '/api/play/convertStop/' + this.convertKey
}).then(function (res) {
if (res.data.code == 0) {
console.log(res.data.msg)
@@ -312,12 +450,20 @@
playFromStreamInfo: function (realHasAudio, streamInfo) {
this.showVideoDialog = true;
this.hasaudio = realHasAudio && this.hasaudio;
- this.$refs.videoPlayer.play(streamInfo.ws_flv)
+ if (this.$refs[this.activePlayer]) {
+ this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
+ }else {
+ this.$nextTick(() => {
+ this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
+ });
+ }
+
+
},
close: function () {
console.log('鍏抽棴瑙嗛');
- if (!!this.$refs.videoPlayer){
- this.$refs.videoPlayer.pause();
+ if (!!this.$refs[this.activePlayer]){
+ this.$refs[this.activePlayer].pause();
}
this.videoUrl = '';
this.coverPlaying = false;
@@ -326,10 +472,6 @@
this.convertStop();
}
this.convertKey = ''
- if (this.recordPlay != '') {
- this.stopPlayRecord();
- }
- this.recordPlay = ''
},
copySharedInfo: function (data) {
@@ -354,70 +496,12 @@
}
);
},
-
- queryRecords: function () {
- if (!this.videoHistory.date) {
- return;
- }
- this.recordsLoading = true;
- this.videoHistory.searchHistoryResult = [];
- let that = this;
- var startTime = this.videoHistory.date + " 00:00:00";
- var endTime = this.videoHistory.date + " 23:59:59";
- this.$axios({
- method: 'get',
- url: '/api/record/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
- }).then(function (res) {
- // 澶勭悊鏃堕棿淇℃伅
- that.videoHistory.searchHistoryResult = res.data.recordList;
- that.recordsLoading = false;
- }).catch(function (e) {
- console.log(e.message);
- // that.videoHistory.searchHistoryResult = falsificationData.recordData;
- });
-
- },
- onTimeChange: function (video) {
- // this.queryRecords()
- },
- playRecord: function (row) {
- let that = this;
- if (that.streamId != "") {
- that.stopPlayRecord(function () {
- that.streamId = "",
- that.playRecord(row);
- })
- } else {
- this.$axios({
- method: 'get',
- url: '/api/playback/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
- row.endTime
- }).then(function (res) {
- var streamInfo = res.data;
- that.streamId = streamInfo.streamId;
- that.videoUrl = streamInfo.ws_flv;
- that.recordPlay = true;
- });
- }
- },
- stopPlayRecord: function (callback) {
- this.$refs.videoPlayer.pause();
- this.videoUrl = '';
- this.$axios({
- method: 'get',
- url: '/api/playback/' + this.streamId + '/stop'
- }).then(function (res) {
- if (callback) callback()
- });
- },
- ptzCamera: function (leftRight, upDown, zoom) {
- console.log('浜戝彴鎺у埗锛�' + leftRight + ' : ' + upDown + " : " + zoom);
+ ptzCamera: function (command) {
+ console.log('浜戝彴鎺у埗锛�' + command);
let that = this;
this.$axios({
method: 'post',
- // url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?leftRight=' + leftRight + '&upDown=' + upDown +
- // '&inOut=' + zoom + '&moveSpeed=50&zoomSpeed=50'
- url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + (zoom * 16 + upDown * 4 + leftRight) + '&horizonSpeed=' + this.controSpeed + '&verticalSpeed=' + this.controSpeed + '&zoomSpeed=' + this.controSpeed
+ url: '/api/ptz/control/' + this.deviceId + '/' + this.channelId + '?command=' + command + '&horizonSpeed=' + this.controSpeed + '&verticalSpeed=' + this.controSpeed + '&zoomSpeed=' + this.controSpeed
}).then(function (res) {});
},
//////////////////////鎾斁鍣ㄤ簨浠跺鐞�//////////////////////////
@@ -429,7 +513,7 @@
let that = this;
this.$axios({
method: 'post',
- url: '/api/frontEndCommand/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=0¶meter2=' + presetPos + '&combindCode2=0'
+ url: '/api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=0¶meter2=' + presetPos + '&combindCode2=0'
}).then(function (res) {});
},
setSpeedOrTime: function (cmdCode, groupNum, parameter) {
@@ -439,7 +523,7 @@
console.log('鍓嶇鎺у埗锛�0x' + cmdCode.toString(16) + ' 0x' + groupNum.toString(16) + ' 0x' + parameter2.toString(16) + ' 0x' + combindCode2.toString(16));
this.$axios({
method: 'post',
- url: '/api/frontEndCommand/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=' + groupNum + '¶meter2=' + parameter2 + '&combindCode2=' + combindCode2
+ url: '/api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=' + groupNum + '¶meter2=' + parameter2 + '&combindCode2=' + combindCode2
}).then(function (res) {});
},
setCommand: function (cmdCode, groupNum, parameter) {
@@ -447,55 +531,20 @@
console.log('鍓嶇鎺у埗锛�0x' + cmdCode.toString(16) + ' 0x' + groupNum.toString(16) + ' 0x' + parameter.toString(16) + ' 0x0');
this.$axios({
method: 'post',
- url: '/api/frontEndCommand/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=' + groupNum + '¶meter2=' + parameter + '&combindCode2=0'
+ url: '/api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=' + groupNum + '¶meter2=' + parameter + '&combindCode2=0'
}).then(function (res) {});
},
- formatTooltip: function (val) {
- var h = parseInt(val / 60);
- var hStr = h < 10 ? ("0" + h) : h;
- var s = val % 60;
- var sStr = s < 10 ? ("0" + s) : s;
- return h + ":" + sStr;
+ copyUrl: function (dropdownItem){
+ console.log(dropdownItem)
+ this.$copyText(dropdownItem).then((e)=> {
+ this.$message.success("鎴愬姛鎷疯礉鍒扮矘璐存澘");
+ }, (e)=> {
+
+ })
},
- timeFormatter: function (row, column, cellValue, index) {
- return cellValue.split(" ")[1];
- },
- mergeTime: function (timeArray) {
- var resultArray = [];
- for (let i = 0; i < timeArray.length; i++) {
- var startTime = new Date(timeArray[i].startTime);
- var endTime = new Date(timeArray[i].endTime);
- if (i == 0) {
- resultArray[0] = {
- startTime: startTime,
- endTime: endTime
- }
- }
- for (let j = 0; j < resultArray.length; j++) {
- if (startTime > resultArray[j].endTime) { // 鍚堝苟
- if (startTime - resultArray[j].endTime <= 1000) {
- resultArray[j].endTime = endTime;
- } else {
- resultArray[resultArray.length] = {
- startTime: startTime,
- endTime: endTime
- }
- }
- } else if (resultArray[j].startTime > endTime) { // 鍚堝苟
- if (resultArray[j].startTime - endTime <= 1000) {
- resultArray[j].startTime = startTime;
- } else {
- resultArray[resultArray.length] = {
- startTime: startTime,
- endTime: endTime
- }
- }
- }
- }
- }
- console.log(resultArray)
- return resultArray;
- }
+
+
+
}
};
</script>
--
Gitblit v1.8.0