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 = ({
}
- {
+ {videoObj.highDefinition ?
videoObj.playUrlSd && videoObj.playUrlHd ?
resolution == 'sd' ?
标清
:
高清
- : ''
+ : '' : ""
}
> : ''
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 ?
- 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 || ''}`
}
-
+ 480?15:10} style={{}}>
{content && content?.length > 0 ? : ""}
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,
})
}