Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial

code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx

@@ -128,7 +128,7 @@ const VideoPlay = ({ dispatch, actions,
             // console.log(yingshiPlayer.current);
             if (disappear || duration > 2000) {
                setVideoMask(true)
-               dispatch(openness.getErrorCode({ status: numbers, platform: videoObj.type })).then((res) => {
+               dispatch(openness.getErrorCode(videoObj.videoToken ? { status: numbers, platform: videoObj.type, token: videoObj.videoToken } : { status: numbers, platform: videoObj.type })).then((res) => {
                   if (res.payload.data) {
                      if (res.payload.data.paraphraseCustom) {
                         setWritten(res.payload.data.paraphraseCustom)
@@ -372,11 +372,11 @@ const VideoPlay = ({ dispatch, actions,
             //    console.log(err);
             // })
             videoFront = new moment(); //验证前时间
-            const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`).then((res) =>{
+            const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`).then((res) => {
                videoAfter = new moment();  //验证后时间
                console.log(11111, res)
             })
-            
+
          } catch (error) {
             console.log(123151);
             console.log(error.response);
@@ -399,7 +399,7 @@ const VideoPlay = ({ dispatch, actions,
                audio: false,
             },
             forceNoOffscreen: false,
-            controlAutoHide:true,
+            controlAutoHide: true,
             isNotMute: false,
          });
          setjessibuca(jessibuca)