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

2 years ago · 6ea960327d
5 changed files with 27 additions and 16 deletions
--- a/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js
+++ b/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js
@ -5,7 +5,7 @@ const moment = require('moment')
 async function getCameraProject (ctx, next) {
   try {
      const models = ctx.fs.dc.models;
-      const { limit, page, orderBy, orderDirection, keyword, abilityId, type, venderId, nvrId, externalDomain, state } = ctx.query
+      const { limit, page, orderBy, orderDirection, keyword, abilityId, type, venderId, nvrId, externalDomain, state, serialNo } = ctx.query
      const { userId, token } = ctx.fs.api
      const { utils: { getPlayUrl } } = ctx.app.fs

@ -77,6 +77,9 @@ async function getCameraProject (ctx, next) {
      if (externalDomain) {
         findOption.where.externalDomain = externalDomain
      }
+      if (serialNo) {
+         findOption.where.serialNo = { $in: serialNo.split(',') }
+      }
      if (state) {
         if (state == 'DISABLED') {
            findOption.where.forbidden = true
--- a/code/VideoAccess-VCMP/web/client/index.ejs
+++ b/code/VideoAccess-VCMP/web/client/index.ejs
@ -4,7 +4,7 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width" />
-   <meta content="upgrade-insecure-requests" http-equiv="Content-Security-Policy">
+   <!-- <meta content="upgrade-insecure-requests" http-equiv="Content-Security-Policy"> -->
   <link rel="shortcut icon" href="/assets/images/favicon.ico">
   <script src="/assets/js/jessibuca/jessibuca.js"></script>
   <script
--- a/code/VideoAccess-VCMP/web/client/index.html
+++ b/code/VideoAccess-VCMP/web/client/index.html
@ -5,7 +5,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width" />

-    <!-- <meta content="upgrade-insecure-requests" http-equiv="Content-Security-Policy">  会将http转化成https,导致jessibuca视频播放不成功 -->
+    <!-- <meta content="upgrade-insecure-requests" http-equiv="Content-Security-Policy">  会将http转化成https,导致jessibuca视频播放不成功  -->

    <link rel="shortcut icon" href="/assets/images/favicon.ico">
    <script src="/assets/js/jessibuca/jessibuca.js"></script>
--- 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: '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',
   // },
@ -67,7 +67,7 @@ const VideoPlay = ({ dispatch, actions,
   iotVideoServer,
   local, //是否本地调用视频
 }) => {
-   // console.log('1754',videoStyle);
+   // console.log('1754',videoObj);
   if (videoObj.type == 'yingshi') {
      videoObj = {
         ...videoObj,
@ -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(() => {
@ -141,7 +142,6 @@ const VideoPlay = ({ dispatch, actions,
                  } else {
                     setWritten('视频异常，问题处理中...')
                  }
-
               });
            }

@ -200,7 +200,7 @@ const VideoPlay = ({ dispatch, actions,
      }
   }, {
      key: 'talk',
-      hide:  !videoObj.audio,
+      hide: !videoObj.audio,
      click: (e) => {
         changeSelectState('talk')
      }
@ -227,7 +227,7 @@ const VideoPlay = ({ dispatch, actions,
      }
   }, {
      key: 'histroy',
-      hide:  !Boolean(videoObj.replayUrl),
+      hide: !Boolean(videoObj.replayUrl),
      click: () => {
         changeSelectState('histroy')
         videoFront = new moment(); //验证前时间
@ -284,7 +284,7 @@ const VideoPlay = ({ dispatch, actions,
      });

      document.onkeydown = (e) => {
-   
+
      }

      // const resize_ = () => {
@ -297,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()
@ -361,6 +361,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 +371,14 @@ const VideoPlay = ({ dispatch, actions,
            // }, err => {.
            //    console.log(err);
            // })
-            const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`)
+            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)
+            })
+            
         } catch (error) {
+            console.log(123151);
            console.log(error.response);
         }

@ -395,6 +402,7 @@ const VideoPlay = ({ dispatch, actions,
            isNotMute: false,
         });
         setjessibuca(jessibuca)
+         jessibucas.current = jessibuca
         play({ jessibuca })
      } else {
         videoFront = new moment(); //验证前时间
@ -539,7 +547,7 @@ const VideoPlay = ({ dispatch, actions,
                  // />
               }
               <div id={containerId} style={{ height: '100%', width: '100%', }}></div>
-               {videoMask ? <div style={{ height: '100%', width: '100%', position: 'absolute', top: '0', left: '0', backgroundColor: 'black', color: "red", }}><div style={{ position: 'absolute', top: 'calc(60%)', left: 0, zIndex: 99, textAlign: 'center', width: '100%' }}>{written}</div></div> : ''}
+               {/* {videoMask ? <div style={{ height: '100%', width: '100%', position: 'absolute', top: '0', left: '0', backgroundColor: 'black', color: "red", }}><div style={{ position: 'absolute', top: 'calc(60%)', left: 0, zIndex: 99, textAlign: 'center', width: '100%' }}>{written}</div></div> : ''} */}

               {/* 下方操作栏 */}
               {/* 显示操作功能条件（宽高） */}
--- 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));
                                }}
                            />
                        </Button>