Browse Source

topSerialNo 视频请求参数

dev_trial
wenlele 3 years ago
parent
commit
cddbb2f028
  1. 1
      code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js
  2. 6
      code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
  3. 2
      code/VideoAccess-VCMP/web/package.json

1
code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js

@ -79,6 +79,7 @@ async function getCameraProject (ctx, next) {
} }
if (serialNo) { if (serialNo) {
findOption.where.serialNo = { $in: serialNo.split(',') } findOption.where.serialNo = { $in: serialNo.split(',') }
findOption.where.topSerialNo = { $in: serialNo.split(',') }
} }
if (state) { if (state) {
if (state == 'DISABLED') { if (state == 'DISABLED') {

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

@ -56,6 +56,7 @@ const VideoPlay = ({ dispatch, actions,
// videoObj = { // videoObj = {
// type: 'cascade', // type: 'cascade',
// audio: false, // audio: false,
// cloudControl: true,
// serialNo: '34020000001310000001', // // serialNo: '34020000001310000001', //
// topSerialNo: '34020000001320000001', // // topSerialNo: '34020000001320000001', //
// playUrlSd: 'wss://221.230.55.27:8082/jessica/34020000001320000001/34020000001310000001', // // playUrlSd: 'wss://221.230.55.27:8082/jessica/34020000001320000001/34020000001310000001', //
@ -68,7 +69,7 @@ const VideoPlay = ({ dispatch, actions,
iotVideoPlayServer, iotVideoPlayServer,
local, // local, //
}) => { }) => {
console.log('1754',videoObj); // console.log('1754', videoObj);
if (videoObj.type == 'yingshi') { if (videoObj.type == 'yingshi') {
videoObj = { videoObj = {
...videoObj, ...videoObj,
@ -382,7 +383,6 @@ const VideoPlay = ({ dispatch, actions,
videoAfter = new moment(); // videoAfter = new moment(); //
console.log(11111, res) console.log(11111, res)
}) })
} catch (error) { } catch (error) {
console.log(123151); console.log(123151);
console.log(error.response); console.log(error.response);
@ -449,7 +449,7 @@ const VideoPlay = ({ dispatch, actions,
const pause = () => { const pause = () => {
if (videoObj.type == 'yingshi' && player) { if (videoObj.type == 'yingshi' && player) {
5
} else if (jessibuca) { } else if (jessibuca) {
jessibuca.pause(); jessibuca.pause();
setIsPlaying(false) setIsPlaying(false)

2
code/VideoAccess-VCMP/web/package.json

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

Loading…
Cancel
Save