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

@@ -56,7 +56,7 @@ const VideoPlay = ({
     //     audio: false,
     //     serialNo: '34020000001310000001', // 设备序列号 必须
     //     topSerialNo: '34020000001110000077', // 设备顶级序列号 必须
-    //     playUrlSd: 'ws://221.230.55.27:8081/jessica/34020000001110000077/34020000001310000001', // 必须
+    //     playUrlSd: 'http://221.230.55.27:8081/jessica/34020000001110000077/34020000001310000001', // 必须
     //     // playUrlHd: 'ezopen://open.ys7.com/G75922040/1.hd.live',
     //     // replayUrl: 'ezopen://open.ys7.com/G75922040/1.rec',
     // },
@@ -291,7 +291,7 @@ const VideoPlay = ({
                 // }, err => {.
                 //    console.log(err);
                 // })
-
+                console.log(videoObj);
                 const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`)
             } catch (error) {
                 console.log(error.response);

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx

@@ -223,9 +223,9 @@ const CameraHeader = (props) => {
                                         type: row.type,
                                         serialNo: row.serialNo,
                                         yingshiToken: row.secretYingshi?.token,
-                                        playUrlSd: row.gbCamera?.playUrl?.liveUrl?.sd?.ezopen,
-                                        playUrlHd: row.gbCamera?.playUrl?.liveUrl?.hd?.ezopen,
-                                        replayUrl:row.gbCamera?.playUrl?.replayUrl?.cloud,
+                                        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`,
                                         content: data,
                                     })
                                 } else {

code/VideoAccess-VCMP/web/package.json

@@ -7,7 +7,7 @@
       "test": "mocha",
       "start-vite": "cross-env NODE_ENV=developmentVite npm run start-params",
       "start": "cross-env NODE_ENV=development npm run start-params",
-      "start-params": "node server -p 5000 -u http://10.8.30.34:4000 --apiVcmpUrl http://localhost:4000 --apiAuthUrl http://10.8.30.34:4200 --apiAnxinyunUrl http://10.8.30.34:4100  --iotAuthWeb http://localhost:5200 --iotVideoServer ws://221.230.55.27:8081",
+      "start-params": "node server -p 5000 -u http://10.8.30.34:4000 --apiVcmpUrl http://localhost:4000 --apiAuthUrl http://10.8.30.34:4200 --apiAnxinyunUrl http://10.8.30.34:4100  --iotAuthWeb http://localhost:5200 --iotVideoServer http://221.230.55.27:8081",
       "deploy": "export NODE_ENV=production&& npm run build && node server",
       "build-dev": "cross-env NODE_ENV=development&&webpack --config webpack.config.js",
       "build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js"