From 3aac22db88c1672468c5617fc78796c9baee629b Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Wed, 31 Aug 2022 17:42:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/videoPlayer/videoPlay.jsx       | 14 +++++++++-----
 .../src/components/videoPlayer/voiceHeader.jsx     |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

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 7721089..4807f9b 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
@@ -90,6 +90,7 @@ const VideoPlay = ({
    const [size, setSize] = useState({ parentWidth: sizeWh?.parentWidth, parentHeight: sizeWh?.parentHeight, width: width || sizeWh?.parentWidth, height: height || sizeWh?.parentHeight }) //视频本身和父级尺寸
    const [resolution, setResolution] = useState('sd') // 标清 sd  高清 hd
    const [videoMask, setVideoMask] = useState(true) // 视频遮罩
+   const [disappear, setDisappear] = useState(false) // 视频消失
 
 
    // 标记萤石操作中，等待ifream返回信息后清空
@@ -164,7 +165,7 @@ const VideoPlay = ({
       key: 'fullScreen',
       click: () => {
          changeSelectState('fullScreen')
-         let videoplay = document.getElementsByClassName('vcmp_video'+videoObj.id)
+         let videoplay = document.getElementsByClassName('vcmp_video' + videoObj.id)
          if (screenfull.isEnabled) {
             screenfull.toggle(videoplay);
             if (videoObj?.type == 'yingshi' && player) {
@@ -209,7 +210,8 @@ const VideoPlay = ({
 
       // 全屏状态监听
       screenfull.on('change', (e) => {
-         if (e?.path[0]?.id=="vcmp_videoplay"+videoObj.id) {
+         console.log(e?.path[0]?.id);
+         if (e?.path[0]?.id == "vcmp_video" + videoObj.id) {
             if (screenfull.isFullscreen && operationRef.current && !operationRef.current['fullScreen'].select) {
                changeSelectState('fullScreen')
             }
@@ -338,6 +340,8 @@ const VideoPlay = ({
                setRoll(true)
                setVideoMask(false)
                playState.current = true
+               // setDisappear(true)
+               console.log(23154);
             },
             handleError: (e) => {    //播放失败
                console.log(e, '播放失败');
@@ -436,8 +440,8 @@ const VideoPlay = ({
 
    return (
       <>
-         <div className={'vcmp_videoplay'+videoObj.id+" my_vcmp_videoplay"} style={{ width: size?.parentWidth || '100%', height: size?.parentHeight || '100%', backgroundColor: 'black', overflow: 'hidden', display: 'flex', alignItems: 'center', justifyContent: 'center', }}>
-            <div id="vcmp_videoplay" className={'vcmp_video'+videoObj.id} style={{ position: 'relative', height: size?.height || '100%', width: size?.width || '100%', minWidth: 240, minHeight: 135, overflow: 'hidden' }}>              {/* 顶部信息 */}
+         <div className={'vcmp_videoplay' + videoObj.id + " my_vcmp_videoplay"} style={{ width: size?.parentWidth || '100%', height: size?.parentHeight || '100%', backgroundColor: 'black', overflow: 'hidden', display: 'flex', alignItems: 'center', justifyContent: 'center', }}>
+            <div id="vcmp_videoplay" className={'vcmp_video' + videoObj.id} style={{ position: 'relative', height: size?.height || '100%', width: size?.width || '100%', minWidth: 240, minHeight: 135, overflow: 'hidden' }}>              {/* 顶部信息 */}
                <VideoHeader
                   operationState={operationState} changeSelectState={changeSelectState}
                   histroyTime={histroyTime}
@@ -469,7 +473,7 @@ const VideoPlay = ({
                   //     style={{ pointerEvents: 'none' }}
                   // />
                }
-               <div id={containerId} style={{ height: '100%', width: '100%', }}></div>
+               {!disappear ? <div id={containerId} style={{ height: '100%', width: '100%', }}></div> : ''}
                {videoMask ? <div style={{ height: size?.height || '100%', width: size?.width || '100%', minWidth: 400, minHeight: 225, overflow: 'hidden', position: 'absolute', top: '0', left: '0', zIndex: 99, backgroundColor: 'rgba(255,255,255,0.65)' }}></div> : ''}
 
                {/* 下方操作栏 */}
diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
index e91c7b2..6913843 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
@@ -54,7 +54,7 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
         updateTime()
     }, [showTime])
 
-    const vcmp_videoplay = document.getElementsByClassName('vcmp_video'+videoObj.id)?.clientHeight
+    const vcmp_videoplay = document.getElementsByClassName('vcmp_video'+videoObj.id)?.clientHeigh
     const vcmp_videopla = document.getElementsByClassName('vcmp_video'+videoObj.id)?.clientWidth
 
     return (