From a53dce38c2f58c0bfd37203e46dc57aa56025f45 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 十一月 2022 18:22:24 +0800
Subject: [PATCH] Merge pull request #673 from 648540858/wvp-28181-2.0-multi-network
---
web_src/src/components/dialog/devicePlayer.vue | 475 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 402 insertions(+), 73 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 48d295a..e640d6f 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -1,11 +1,27 @@
<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-tab-pane label="wsPlayer">wsPlayer 鏁鏈熷緟</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>-->
@@ -14,20 +30,153 @@
</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 :command="streamInfo.flv.url">
+ <el-tag >FLV:</el-tag>
+ <span>{{ streamInfo.flv.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.https_flv.url">
+ <el-tag >FLV(https):</el-tag>
+ <span>{{ streamInfo.https_flv.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.ws_flv.url">
+ <el-tag >FLV(ws):</el-tag>
+ <span >{{ streamInfo.ws_flv.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.wss_flv.url">
+ <el-tag >FLV(wss):</el-tag>
+ <span>{{ streamInfo.wss_flv.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.fmp4.url">
+ <el-tag >FMP4:</el-tag>
+ <span>{{ streamInfo.fmp4.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.https_fmp4.url">
+ <el-tag >FMP4(https):</el-tag>
+ <span>{{ streamInfo.https_fmp4.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.ws_fmp4.url">
+ <el-tag >FMP4(ws):</el-tag>
+ <span>{{ streamInfo.ws_fmp4.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.wss_fmp4.url">
+ <el-tag >FMP4(wss):</el-tag>
+ <span>{{ streamInfo.wss_fmp4.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.hls.url">
+ <el-tag>HLS:</el-tag>
+ <span>{{ streamInfo.hls.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.https_hls.url">
+ <el-tag >HLS(https):</el-tag>
+ <span>{{ streamInfo.https_hls.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.ws_hls.url">
+ <el-tag >HLS(ws):</el-tag>
+ <span>{{ streamInfo.ws_hls.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.wss_hls.url">
+ <el-tag >HLS(wss):</el-tag>
+ <span>{{ streamInfo.wss_hls.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.ts.url">
+ <el-tag>TS:</el-tag>
+ <span>{{ streamInfo.ts.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.https_ts.url">
+ <el-tag>TS(https):</el-tag>
+ <span>{{ streamInfo.https_ts.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.ws_ts.url">
+ <el-tag>TS(ws):</el-tag>
+ <span>{{ streamInfo.ws_ts.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.wss_ts.url">
+ <el-tag>TS(wss):</el-tag>
+ <span>{{ streamInfo.wss_ts.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtc.url">
+ <el-tag >RTC:</el-tag>
+ <span>{{ streamInfo.rtc.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtcs.url">
+ <el-tag >RTCS:</el-tag>
+ <span>{{ streamInfo.rtcs }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtmp.url">
+ <el-tag >RTMP:</el-tag>
+ <span>{{ streamInfo.rtmp.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtmps.url">
+ <el-tag >RTMPS:</el-tag>
+ <span>{{ streamInfo.rtmps.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtsp.url">
+ <el-tag >RTSP:</el-tag>
+ <span>{{ streamInfo.rtsp.url }}</span>
+ </el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtsps.url">
+ <el-tag >RTSPS:</el-tag>
+ <span>{{ streamInfo.rtsps.url }}</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-tab-pane label="褰曞儚鏌ヨ" name="record" v-if="showRrecord">
+ <div style="width: 100%;">
+ <div style="width: 100%; text-align: left">
+ <span>褰曞儚鎺у埗</span>
+ <el-button-group style="margin-left: 1rem;">
+ <el-button size="mini" class="iconfont icon-zanting" title="寮�濮�" @click="gbPause()"></el-button>
+ <el-button size="mini" class="iconfont icon-kaishi" title="鏆傚仠" @click="gbPlay()"></el-button>
+ <el-dropdown size="mini" title="鎾斁鍊嶉��" style="margin-left: 1px;" @command="gbScale">
+ <el-button size="mini">
+ 鍊嶉�� <i class="el-icon-arrow-down el-icon--right"></i>
+ </el-button>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item command="0.25">0.25鍊嶉��</el-dropdown-item>
+ <el-dropdown-item command="0.5">0.5鍊嶉��</el-dropdown-item>
+ <el-dropdown-item command="1.0">1鍊嶉��</el-dropdown-item>
+ <el-dropdown-item command="2.0">2鍊嶉��</el-dropdown-item>
+ <el-dropdown-item command="4.0">4鍊嶉��</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+ </el-button-group>
+ <el-date-picker style="float: right;" size="mini" v-model="videoHistory.date" type="date" value-format="yyyy-MM-dd" placeholder="鏃ユ湡" @change="queryRecords()"></el-date-picker>
+ </div>
+ <div style="width: 100%; text-align: left">
+ <span class="demonstration" style="padding: 12px 36px 12px 0;float: left;">{{showTimeText}}</span>
+ <el-slider style="width: 80%; float:left;" v-model="sliderTime" @change="gbSeek" :show-tooltip="false"></el-slider>
+ </div>
+ </div>
+
+
<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>
@@ -36,7 +185,10 @@
<el-table-column label="鎿嶄綔">
<template slot-scope="scope">
- <el-button icon="el-icon-video-play" size="mini" @click="playRecord(scope.row)">鎾斁</el-button>
+ <el-button-group>
+ <el-button icon="el-icon-video-play" size="mini" @click="playRecord(scope.row)">鎾斁</el-button>
+ <el-button icon="el-icon-download" size="mini" @click="downloadRecord(scope.row)">涓嬭浇</el-button>
+ </el-button-group>
</template>
</el-table-column>
</el-table>
@@ -45,72 +197,73 @@
<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,45 +282,65 @@
</div>
</el-tab-pane>
+
</el-tabs>
</div>
</el-dialog>
+ <recordDownload ref="recordDownload"></recordDownload>
</div>
</template>
<script>
-import player from '../dialog/player.vue'
+import rtcPlayer from '../dialog/rtcPlayer.vue'
+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: {
- player,
+ LivePlayer, jessibucaPlayer, rtcPlayer, recordDownload,
},
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: '',
+ activePlayer: "jessibuca",
+ // 濡備綍浣犲彧鏄敤涓�绉嶆挱鏀惧櫒锛岀洿鎺ユ敞閲婃帀涓嶇敤鐨勯儴鍒嗗嵆鍙�
+ player: {
+ jessibuca : ["ws_flv", "wss_flv"],
+ livePlayer : ["ws_flv", "wss_flv"],
+ webRTC: ["rtc", "rtcs"],
+ },
videoHistory: {
date: '',
searchHistoryResult: [] //濯掍綋娴佸巻鍙茶褰曟悳绱㈢粨鏋�
},
showVideoDialog: false,
streamId: '',
+ app : '',
+ mediaServerId : '',
convertKey: '',
deviceId: '',
channelId: '',
tabActiveName: 'media',
- hasaudio: false,
+ hasAudio: false,
loadingRecords: false,
recordsLoading: false,
isLoging: false,
@@ -187,6 +360,12 @@
recordPlay: "",
showPtz: true,
showRrecord: true,
+ tracksNotLoaded: false,
+ sliderTime: 0,
+ seekTime: 0,
+ recordStartTime: 0,
+ showTimeText: "00:00:00",
+ streamInfo: null,
};
},
methods: {
@@ -195,15 +374,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,14 +394,25 @@
}).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":
@@ -228,13 +420,13 @@
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":
@@ -245,22 +437,35 @@
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]].url
+ }else {
+ this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]].url
+ }
+ 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 +492,7 @@
},
convertStopClick: function() {
this.convertStop(()=>{
- this.$refs.videoPlayer.play(this.videoUrl)
+ this.$refs[this.activePlayer].play(this.videoUrl)
});
},
convertStop: function(callback) {
@@ -295,7 +500,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 +517,12 @@
playFromStreamInfo: function (realHasAudio, streamInfo) {
this.showVideoDialog = true;
this.hasaudio = realHasAudio && this.hasaudio;
- this.$refs.videoPlayer.play(streamInfo.ws_flv)
+ 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;
@@ -366,11 +571,21 @@
var endTime = this.videoHistory.date + " 23:59:59";
this.$axios({
method: 'get',
- url: '/api/record/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
+ url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
}).then(function (res) {
- // 澶勭悊鏃堕棿淇℃伅
- that.videoHistory.searchHistoryResult = res.data.recordList;
+ console.log(res)
that.recordsLoading = false;
+ if(res.data.code === 0) {
+ // 澶勭悊鏃堕棿淇℃伅
+ that.videoHistory.searchHistoryResult = res.data.data.recordList;
+ }else {
+ this.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+
}).catch(function (e) {
console.log(e.message);
// that.videoHistory.searchHistoryResult = falsificationData.recordData;
@@ -382,42 +597,105 @@
},
playRecord: function (row) {
let that = this;
+
+ let startTime = row.startTime
+ this.recordStartTime = row.startTime
+ this.showTimeText = row.startTime.split(" ")[1]
+ let endtime = row.endTime
+ this.sliderTime = 0;
+ this.seekTime = new Date(endtime).getTime() - new Date(startTime).getTime();
+ console.log(this.seekTime)
if (that.streamId != "") {
that.stopPlayRecord(function () {
- that.streamId = "",
- that.playRecord(row);
+ that.streamId = "";
+ that.playRecord(row);
})
} else {
this.$axios({
method: 'get',
- url: '/api/playback/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
+ url: '/api/playback/start/' + 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;
+ 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;
});
}
},
stopPlayRecord: function (callback) {
- this.$refs.videoPlayer.pause();
+ this.$refs[this.activePlayer].pause();
this.videoUrl = '';
this.$axios({
method: 'get',
- url: '/api/playback/' + this.streamId + '/stop'
+ url: '/api/playback/stop/' + this.deviceId + "/" + this.channelId + "/" + this.streamId
}).then(function (res) {
if (callback) callback()
});
},
- ptzCamera: function (leftRight, upDown, zoom) {
- console.log('浜戝彴鎺у埗锛�' + leftRight + ' : ' + upDown + " : " + zoom);
+ downloadRecord: function (row) {
+ let that = this;
+ if (that.streamId != "") {
+ that.stopDownloadRecord(function (res) {
+ if (res.code == 0) {
+ that.streamId = "";
+ that.downloadRecord(row);
+ }else {
+ this.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+
+ })
+ } else {
+ this.$axios({
+ method: 'get',
+ url: '/api/gb_record/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
+ row.endTime + '&downloadSpeed=4'
+ }).then(function (res) {
+ if (res.data.code == 0) {
+ let streamInfo = res.data.data;
+ that.recordPlay = false;
+ that.$refs.recordDownload.openDialog(that.deviceId, that.channelId, streamInfo.app, streamInfo.stream, streamInfo.mediaServerId);
+ }else {
+ that.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+ });
+ }
+ },
+ stopDownloadRecord: function (callback) {
+ this.$refs[this.activePlayer].pause();
+ this.videoUrl = '';
+ this.$axios({
+ method: 'get',
+ url: '/api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.streamId
+ }).then((res)=> {
+ if (callback) callback(res)
+ });
+ },
+ 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 +707,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 +717,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,7 +725,7 @@
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) {
@@ -495,7 +773,58 @@
}
console.log(resultArray)
return resultArray;
- }
+ },
+ copyUrl: function (dropdownItem){
+ console.log(dropdownItem)
+ this.$copyText(dropdownItem).then((e)=> {
+ this.$message.success("鎴愬姛鎷疯礉鍒扮矘璐存澘");
+ }, (e)=> {
+
+ })
+ },
+ gbPlay(){
+ console.log('鍓嶇鎺у埗锛氭挱鏀�');
+ this.$axios({
+ method: 'get',
+ url: '/api/playback/resume/' + this.streamId
+ }).then((res)=> {
+ this.$refs[this.activePlayer].play(this.videoUrl)
+ });
+ },
+ gbPause(){
+ console.log('鍓嶇鎺у埗锛氭殏鍋�');
+ this.$axios({
+ method: 'get',
+ url: '/api/playback/pause/' + this.streamId
+ }).then(function (res) {});
+ },
+ gbScale(command){
+ console.log('鍓嶇鎺у埗锛氬�嶉�� ' + command);
+ this.$axios({
+ method: 'get',
+ url: `/api/playback/speed/${this.streamId }/${command}`
+ }).then(function (res) {});
+ },
+ gbSeek(val){
+ console.log('鍓嶇鎺у埗锛歴eek ');
+ console.log(this.seekTime);
+ console.log(this.sliderTime);
+ let showTime = new Date(new Date(this.recordStartTime).getTime() + this.seekTime * val / 100)
+ let hour = showTime.getHours();
+ let minutes = showTime.getMinutes();
+ let seconds = showTime.getSeconds();
+ this.showTimeText = (hour < 10?("0" + hour):hour) + ":" + (minutes<10?("0" + minutes):minutes) + ":" + (seconds<10?("0" + seconds):seconds)
+ this.$axios({
+ method: 'get',
+ url: `/api/playback/seek/${this.streamId }/` + Math.floor(this.seekTime * val / 100000)
+ }).then( (res)=> {
+ setTimeout(()=>{
+ this.$refs[this.activePlayer].play(this.videoUrl)
+ }, 600)
+ });
+ },
+
+
}
};
</script>
--
Gitblit v1.8.0