From 6aaff35ff54c89b589718276847b8c3b9ba0249a Mon Sep 17 00:00:00 2001 From: wenlele Date: Tue, 13 Sep 2022 20:53:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?jessibuca=20=20=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/VideoAccess-VCMP/web/client/index.html | 2 +- .../src/components/videoPlayer/videoPlay.jsx | 22 +++++++++++-------- .../equipmentWarehouse/containers/nvr.jsx | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/code/VideoAccess-VCMP/web/client/index.html b/code/VideoAccess-VCMP/web/client/index.html index 05414a7..5db6629 100644 --- a/code/VideoAccess-VCMP/web/client/index.html +++ b/code/VideoAccess-VCMP/web/client/index.html @@ -5,7 +5,7 @@ - + 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 67f674f..52fc096 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx @@ -56,9 +56,9 @@ const VideoPlay = ({ dispatch, actions, // videoObj = { // type: 'cascade', // audio: false, - // serialNo: '34020000001310000001', // 设备序列号 必须 - // topSerialNo: '34020000001110000077', // 设备顶级序列号 必须 - // playUrlSd: 'http://221.230.55.27:8081/jessica/34020000001110000077/34020000001310000001', // 必须 + // serialNo: '34020000001310000003', // 设备序列号 必须 + // topSerialNo: '34020000001110000079', // 设备顶级序列号 必须 + // playUrlSd: 'http://221.230.55.27:8081/jessica/34020000001110000079/34020000001310000003', // 必须 // // playUrlHd: 'ezopen://open.ys7.com/G75922040/1.hd.live', // // replayUrl: 'ezopen://open.ys7.com/G75922040/1.rec', // }, @@ -67,7 +67,7 @@ const VideoPlay = ({ dispatch, actions, iotVideoServer, local, //是否本地调用视频 }) => { - // console.log('1754',videoStyle); + // console.log('1754',videoObj); if (videoObj.type == 'yingshi') { videoObj = { ...videoObj, @@ -141,7 +141,6 @@ const VideoPlay = ({ dispatch, actions, } else { setWritten('视频异常，问题处理中...') } - }); } @@ -200,7 +199,7 @@ const VideoPlay = ({ dispatch, actions, } }, { key: 'talk', - hide: !videoObj.audio, + hide: !videoObj.audio, click: (e) => { changeSelectState('talk') } @@ -227,7 +226,7 @@ const VideoPlay = ({ dispatch, actions, } }, { key: 'histroy', - hide: !Boolean(videoObj.replayUrl), + hide: !Boolean(videoObj.replayUrl), click: () => { changeSelectState('histroy') videoFront = new moment(); //验证前时间 @@ -284,7 +283,7 @@ const VideoPlay = ({ dispatch, actions, }); document.onkeydown = (e) => { - + } // const resize_ = () => { @@ -361,6 +360,7 @@ const VideoPlay = ({ dispatch, actions, const createPlay = async () => { if (videoObj.type != 'yingshi') { + // console.log(videoObj,iotVideoServer); try { // const inviteRes = await IotVideoServerRequest.get(VideoServeApi.invite, { // id: '36011200002002021114', @@ -370,8 +370,12 @@ const VideoPlay = ({ dispatch, actions, // }, err => {. // console.log(err); // }) - const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`) + const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`).then((res) =>{ + console.log(11111, res) + }) + } catch (error) { + console.log(123151); console.log(error.response); } diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx index cce4ace..6dc8212 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx @@ -141,7 +141,7 @@ const NvrHeader = (props) => { modalName="revise" venderList={venderList} close={() => { - dispatch(equipmentWarehouse.getNvr(searchb.current)); + dispatch(equipmentWarehouse.getNvr(searchData.current)); }} /> From a7a33e71f95cb7bb10a71fb2d7909419bba5515b Mon Sep 17 00:00:00 2001 From: wenlele Date: Wed, 14 Sep 2022 09:25:33 +0800 Subject: [PATCH 2/3] http --- code/VideoAccess-VCMP/web/client/index.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/VideoAccess-VCMP/web/client/index.ejs b/code/VideoAccess-VCMP/web/client/index.ejs index 70dffe5..0e4ff01 100644 --- a/code/VideoAccess-VCMP/web/client/index.ejs +++ b/code/VideoAccess-VCMP/web/client/index.ejs @@ -4,7 +4,7 @@ - + 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 52fc096..ffe0152 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx @@ -58,7 +58,7 @@ const VideoPlay = ({ dispatch, actions, // audio: false, // serialNo: '34020000001310000003', // 设备序列号 必须 // topSerialNo: '34020000001110000079', // 设备顶级序列号 必须 - // playUrlSd: 'http://221.230.55.27:8081/jessica/34020000001110000079/34020000001310000003', // 必须 + // playUrlSd: 'ws://221.230.55.27:8081/jessica/34020000001110000079/34020000001310000003', // 必须 // // playUrlHd: 'ezopen://open.ys7.com/G75922040/1.hd.live', // // replayUrl: 'ezopen://open.ys7.com/G75922040/1.rec', // }, @@ -111,6 +111,7 @@ const VideoPlay = ({ dispatch, actions, const yingshiPrepareRef = useRef(null) const playState = useRef(false) //播放状态 const yingshiPlayer = useRef(null) + const jessibucas = useRef(null) useEffect(() => { @@ -296,8 +297,8 @@ const VideoPlay = ({ dispatch, actions, // } return () => { - if (jessibuca) { - jessibuca.destroy() + if (jessibucas.current) { + jessibucas.current.destroy() } if (yingshiPlayer.current && videoObj.type == 'yingshi') { yingshiPlayer.current.stop() @@ -370,7 +371,9 @@ const VideoPlay = ({ dispatch, actions, // }, err => {. // console.log(err); // }) + videoFront = new moment(); //验证前时间 const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`).then((res) =>{ + videoAfter = new moment(); //验证后时间 console.log(11111, res) }) @@ -399,6 +402,7 @@ const VideoPlay = ({ dispatch, actions, isNotMute: false, }); setjessibuca(jessibuca) + jessibucas.current = jessibuca play({ jessibuca }) } else { videoFront = new moment(); //验证前时间 @@ -543,7 +547,7 @@ const VideoPlay = ({ dispatch, actions, // /> }
- {videoMask ?
{written}
: ''} + {/* {videoMask ?
{written}
: ''} */} {/* 下方操作栏 */} {/* 显示操作功能条件（宽高） */}