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 36d05a1..77434b7 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx @@ -19,19 +19,19 @@ const VideoPlay = ({ // playUrl, name, - // videoObj, - - videoObj = { - type: 'yingshi', - audio: false, - serialNo: 'G75922040', // 设备序列号 必须 - channelNo: 1, // - yingshiToken: 'at.3j6eyqbn0g5xvcut73v0rzdu1nh0gnxx-4ua03m82o9-12u1t9g-rtzndpyds', // 萤石必须 - playUrlSd: 'ezopen://open.ys7.com/G75922040/1.live', // 必须 - // playUrl: 'ws://221.230.55.27:8081/jessica/34020000001110000077/34020000001310000003', - playUrlHd: 'ezopen://open.ys7.com/G75922040/1.hd.live', - // replayUrl: 'ezopen://open.ys7.com/G75922040/1.rec', - }, + videoObj, + + // videoObj = { + // type: 'yingshi', + // audio: false, + // serialNo: 'G75922040', // 设备序列号 必须 + // channelNo: 1, // + // yingshiToken: 'at.3j6eyqbn0g5xvcut73v0rzdu1nh0gnxx-4ua03m82o9-12u1t9g-rtzndpyds', // 萤石必须 + // playUrlSd: 'ezopen://open.ys7.com/G75922040/1.live', // 必须 + // // playUrl: 'ws://221.230.55.27:8081/jessica/34020000001110000077/34020000001310000003', + // playUrlHd: 'ezopen://open.ys7.com/G75922040/1.hd.live', + // // replayUrl: 'ezopen://open.ys7.com/G75922040/1.rec', + // }, // videoObj = { // type: 'cascade', diff --git a/code/VideoAccess-VCMP/web/client/src/sections/monitor/containers/videoPlayCross.jsx b/code/VideoAccess-VCMP/web/client/src/sections/monitor/containers/videoPlayCross.jsx index 8b65616..bf159dc 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/monitor/containers/videoPlayCross.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/monitor/containers/videoPlayCross.jsx @@ -11,7 +11,9 @@ const VideoPlayCross = (props) => { if (props.location.search) { const params = qs.parse(props.location.search.slice(1)) if (params.videoObj) { - params.videoObj = (new Function("return " + params.videoObj))() + console.log(params.videoObj); + // params.videoObj = (new Function("return " + params.videoObj))() + params.videoObj = JSON.parse(params.videoObj) setVideoParams(params) return }