From 5d7aaf18bdf1d29d89ab549358a66d344df1e8ca Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Tue, 6 Sep 2022 08:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=EF=BC=8C=E4=BA=91=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/src/components/videoPlayer/videoOperation.jsx | 8 ++++----
 .../web/client/src/components/videoPlayer/videoPlay.jsx  | 9 +++++----
 .../client/src/components/videoPlayer/voiceHeader.jsx    | 4 ++--
 .../sections/equipmentWarehouse/containers/camera.jsx    | 6 ++++++
 4 files changed, 17 insertions(+), 10 deletions(-)

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 a895ec3..6a321e6 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx
@@ -53,9 +53,9 @@ const VideoOperation = ({
       videoFront = new moment(); //验证前时间
       player.stop().then((res) => {
          if (resolution == 'sd') {
-            player.play({ url: videoObj?.playUrlHd, options: { hd: true } }) 
+            player.play({ url: videoObj?.playUrlHd, options: { hd: true } })
          } else {
-            player.play({ url: videoObj?.playUrlSd, options: { hd: false } } )
+            player.play({ url: videoObj?.playUrlSd, options: { hd: false } })
          }
          playState = false
       })
@@ -145,12 +145,12 @@ const VideoOperation = ({
                               }
                            </div>
                            <div style={{ display: 'flex', alignItems: 'center', userSelect: 'none' }}>
-                              {
+                              {videoObj.highDefinition ?
                                  videoObj.playUrlSd && videoObj.playUrlHd ?
                                     resolution == 'sd' ?
                                        <div style={butStyle} onClick={changeResolution}>标清</div> :
                                        <div style={butStyle} onClick={changeResolution}>高清</div>
-                                    : ''
+                                    : '' : ""
                               }
                            </div>
                         </> : ''
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 1be83f0..67f674f 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
@@ -67,7 +67,7 @@ const VideoPlay = ({ dispatch, actions,
    iotVideoServer,
    local, //是否本地调用视频
 }) => {
-   // console.log(videoObj);
+   // console.log('1754',videoStyle);
    if (videoObj.type == 'yingshi') {
       videoObj = {
          ...videoObj,
@@ -194,12 +194,13 @@ const VideoPlay = ({ dispatch, actions,
    // 实时播放左下方操作栏内容
    const operation = [{
       key: 'control',
+      hide: !videoObj.cloudControl,
       click: () => {
          changeSelectState('control')
       }
    }, {
       key: 'talk',
-      hide: !(videoObj.type == 'yingshi'),
+      hide:  !videoObj.audio,
       click: (e) => {
          changeSelectState('talk')
       }
@@ -226,7 +227,7 @@ const VideoPlay = ({ dispatch, actions,
       }
    }, {
       key: 'histroy',
-      hide: !Boolean(videoObj.replayUrl),
+      hide:  !Boolean(videoObj.replayUrl),
       click: () => {
          changeSelectState('histroy')
          videoFront = new moment(); //验证前时间
@@ -542,7 +543,7 @@ const VideoPlay = ({ dispatch, actions,
 
                {/* 下方操作栏 */}
                {/* 显示操作功能条件（宽高） */}
-               {size?.parentWidth > 320 ?
+               {size?.parentWidth > 480 ?
                   <VideoOperation
                      operationState={operationState} operation={operation}
                      voiceDisY={voiceDisY} setVoiceDisY={setVoiceDisY}
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 44921da..05abe2b 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
@@ -86,7 +86,7 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
             color: '#fff'
          }}>
             <Row>
-               <Col span={histroyTime.length ? videoStyle == 'true' ? 3 : 9 : 0} style={{
+               <Col span={videoStyle == 'true'  ? histroyTime.length ? 3 : 0 : 9} style={{
                   backgroundImage: content && content?.length > 0 ? 'url(/assets/images/background/videoPlayBg.png)' : '',
                   backgroundSize: '100% 100%',
                   backgroundRepeat: 'no-repeat',
@@ -103,7 +103,7 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
                         '' : `${showTime_} ${name || ''}`
                   }
                </Col>
-               <Col span={histroyTime.length ? videoStyle == 'true' ? 21 : 15 : 24} style={{}}>
+               <Col span={videoStyle == 'true' ? histroyTime.length ? 21 : 24 : vcmp_videopla > 480?15:10} style={{}}>
                   <div style={{ paddingRight: 12 }}>
                      {content && content?.length > 0 ? <TextScroll content={content || []} duration={6} videoObj={videoObj} /> : ""}
                   </div>
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
index 26c3678..d671b79 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
@@ -223,6 +223,9 @@ const CameraHeader = (props) => {
                                         serialNo: row.serialNo,
                                         yingshiToken: row.secretYingshi?.token,
                                         channelNo: row.channelNo || 1,
+                                        audio:row.voice,
+                                        highDefinition:row.highDefinition,
+                                        cloudControl:row.cloudControl,
                                         // playUrlSd: `ezopen://open.ys7.com/${row.serialNo}/${row.channelNo || 1}.live`,
                                         // playUrlHd: `ezopen://open.ys7.com/${row.serialNo}/${row.channelNo || 1}.hd.live`,
                                         // replayUrl: `ezopen://open.ys7.com/${row.serialNo}/${row.channelNo || 1}.hd.local.rec`,
@@ -235,6 +238,9 @@ const CameraHeader = (props) => {
                                         serialNo: row.serialNo,
                                         topSerialNo: row.topSerialNo,
                                         playUrlSd: row.gbCamera?.playUrl?.liveUrl?.sd["WS-RAW"],
+                                        audio:row.voice,
+                                        highDefinition:row.highDefinition,
+                                        cloudControl:row.cloudControl,
                                         content: data,
                                     })
                                 }