From 0594201af5559630a8d00649e2d3b2898bba171e Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Fri, 17 Jun 2022 10:59:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=92=AD=E6=94=BE=E5=99=A8=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=20100%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/images/background/warning.png | Bin 0 -> 722 bytes .../videoPlayer/VideoOperationTime.jsx | 46 ++++++++++++++++++ .../components/videoPlayer/videoOperation.jsx | 27 ++++++++-- .../videoPlayer/videoOperationTalk.jsx | 25 ++++------ .../src/components/videoPlayer/videoPlay.jsx | 4 +- .../src/components/videoPlayer/videoPlay.less | 6 +++ .../components/videoPlayer/videoPlayModal.jsx | 3 +- 7 files changed, 90 insertions(+), 21 deletions(-) create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/background/warning.png create mode 100644 code/VideoAccess-VCMP/web/client/src/components/videoPlayer/VideoOperationTime.jsx diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/warning.png b/code/VideoAccess-VCMP/web/client/assets/images/background/warning.png new file mode 100644 index 0000000000000000000000000000000000000000..906fdf57d1065d448d4f7c2382c33cde57513000 GIT binary patch literal 722 zcmV;@0xkWCP)Px%j7da6R7gv`md|fYQ545N=S`F}5)vEY=U>34to#UeNQxj5ttP}s=$IL4H)1TR zRvPn$Axsdz5{ZgvB6djI9o^_Zpop-M5K^?vk$2yl>HIS9zC?OfFL~#CKj)l#@3}{? zFg?Kv95w(ufi{H2My7lM#(>8Z8I_B?3tLW_IcSo#2;B%{^i>c zsBsq1${8SzFh4Bns{hJ&pui-3Qs8T?whpK%RslB7a zPY_l&g(=g3gAfbx8)u3ga)tLLzcNr$EJSz&Y!1n6nBSy{F%P&J8XUYp*)1+#yme=Q zNiN`!4lQGmPRVi49MUAGaX4$C$x4osWuT^MLm5VBwGht$Q)CeOLN&@H!Y0WwW-`18J@%8l%?*DxO9moSVoMO2urMlMG}%D9|U?Hp~p(6eB=-7M3Z#j zaMw!YXV@z)1LiZ$C7|0{>+Qd$7)00;L6ngk{XvG;5aQNa<)H_BgP6;1YyFZX698`^ zblD0~CPdTx0CT78Oc@ZD-k_xSf&F$ub1e` z)<9FzsE5Yec$d8aa1>#E1fV%I2N1tiS=u)g@346L-WhTKJEC8F%c$zyN*6yUO_bL5 zt6UMK17WUJ42s{{g41T-ykStX>;78K<0XER%tfYk@U`=S$b`GzZqFpZYw&Y$vM0wCT-25*?)HH`G zVSZ5>*sP9;mHb&7glm&FqrP_ { + + return ( +
+
+ +
+
+ + + 最长时间跨度不超过72小时 + + + + + + + +
+
+ ) +} + +function mapStateToProps (state) { + const { auth } = state; + return { + user: auth.user, + }; +} + +export default connect(mapStateToProps)(VideoOperationTime); \ No newline at end of file diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx index cd7eade..83c185b 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx @@ -5,10 +5,15 @@ import VideoOperationCloudControl from './videoOperationCloudControl' import VideoOperationTalk from './VideoOperationTalk' import VideoOperationSpeed from './videoOperationSpeed' import VideoOperationVoice from './VideoOperationVoice' +import VideoOperationTime from './VideoOperationTime' import { IconPause, IconPlay } from '@douyinfe/semi-icons'; import './videoPlay.less'; -const VideoOperation = ({ operationState, operation, voiceDisY, setVoiceDisY }) => { +const VideoOperation = ({ + operationState, operation, voiceDisY, setVoiceDisY, + resolution, setResolution +}) => { + const [showTimeSelect, setShowTimeSelect] = useState(false) const butStyle = { border: '1px solid #fff', display: 'inline-block', color: '#fff', padding: '0 10px', @@ -16,6 +21,10 @@ const VideoOperation = ({ operationState, operation, voiceDisY, setVoiceDisY }) position: 'relative' } + const changeResolution = () => { + setResolution(resolution == 'sd' ? 'hd' : 'sd') + } + return ( <> { @@ -26,6 +35,11 @@ const VideoOperation = ({ operationState, operation, voiceDisY, setVoiceDisY }) : '' : '' } + { + showTimeSelect ? + { setShowTimeSelect(false) }} /> + : '' + } {/* 下方操作 */}
-
时间设置
+
{ + setShowTimeSelect(!showTimeSelect) + }}>时间设置
: @@ -63,8 +79,11 @@ const VideoOperation = ({ operationState, operation, voiceDisY, setVoiceDisY }) }
-
标清
-
高清
+ { + resolution == 'sd' ? +
标清
: +
高清
+ }
: '' } diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperationTalk.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperationTalk.jsx index dd4e0d5..9827edb 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperationTalk.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperationTalk.jsx @@ -2,23 +2,18 @@ import React, { useState, useEffect, useRef } from "react"; import { connect } from "react-redux"; import './videoPlay.less'; -const VideoOperationTalk = ({ butStyle }) => { +const VideoOperationTalk = ({ }) => { return ( -
-
- { - [1, 2, 3].map((s) => { - return ( -
{s}.0 x
- ) - }) - } -
- 倍速 +
+ +
开始讲话
) } diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx index 4c5662c..5ddbec4 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx @@ -11,6 +11,7 @@ const VideoPlay = ({ height, width }) => { const [isPlaying, setIsPlaying] = useState(false) const [operationState, setoperationState] = useState() const [voiceDisY, setVoiceDisY] = useState(0) + const [resolution, setResolution] = useState('sd') // 标清 sd 高清 hd const changeSelectState = (key) => { const nextOperationState = JSON.parse(JSON.stringify(operationState)) @@ -107,7 +108,7 @@ const VideoPlay = ({ height, width }) => { return ( <> -
+
{/* 顶部信息 */} @@ -122,6 +123,7 @@ const VideoPlay = ({ height, width }) => {
diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.less b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.less index 3be1780..43e19bf 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.less +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.less @@ -1,3 +1,9 @@ +.vcmp_videoplay { + .semi-datepicker { + background-color: #fff; + } +} + .video_speed_but:hover { .video_speed_options { display: block; diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlayModal.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlayModal.jsx index 6f9c894..c76fc85 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlayModal.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlayModal.jsx @@ -5,7 +5,7 @@ import { Button, Modal, } from "@douyinfe/semi-ui"; import VideoPlay from './videoPlay' import './videoPlayModal.less'; -const VideoPlayModal = ({ visible }) => { +const VideoPlayModal = ({ visible, close }) => { return ( { size={'large'} style={{}} bodyStyle={{}} + onCancel={() => { close() }} className="videoModal" >