free-sun
/
FS-IOT
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev_trial
巴林闲侠 3 years ago
parent
57e82130c3 a9c800143c
commit
aefcce58d3
9 changed files with 392 additions and 388 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      code/VideoAccess-VCMP/web/client/index.ejs
  2. 2
      code/VideoAccess-VCMP/web/client/index.html
  3. 5
      code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
  4. 4
      code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
  5. 6
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
  6. 4
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx
  7. 5
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx
  8. 2
      code/VideoAccess-VCMP/web/package.json

2
code/VideoAccess-VCMP/web/client/index.ejs
View File

@ -4,7 +4,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width" /> <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"> <link rel="shortcut icon" href="/assets/images/favicon.ico">
<script src="/assets/js/jessibuca/jessibuca.js"></script> <script src="/assets/js/jessibuca/jessibuca.js"></script>
<script <script

2
code/VideoAccess-VCMP/web/client/index.html
View File

@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width" /> <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">
<link rel="shortcut icon" href="/assets/images/favicon.ico"> <link rel="shortcut icon" href="/assets/images/favicon.ico">
<script src="/assets/js/jessibuca/jessibuca.js"></script> <script src="/assets/js/jessibuca/jessibuca.js"></script>

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

@ -58,7 +58,7 @@ const VideoPlay = ({ dispatch, actions,
// audio: false, // audio: false,
// serialNo: '34020000001310000003', // 设备序列号 必须 // serialNo: '34020000001310000003', // 设备序列号 必须
// topSerialNo: '34020000001110000079', // 设备顶级序列号 必须 // topSerialNo: '34020000001110000079', // 设备顶级序列号 必须
// playUrlSd: 'ws://221.230.55.27:8081/jessica/34020000001110000079/34020000001310000003', // 必须 // playUrlSd: 'wss://221.230.55.27:8082/jessica/34020000001110000079/34020000001310000003.flv', // 必须
// // playUrlHd: 'ezopen://open.ys7.com/G75922040/1.hd.live', // // playUrlHd: 'ezopen://open.ys7.com/G75922040/1.hd.live',
// // replayUrl: 'ezopen://open.ys7.com/G75922040/1.rec', // // replayUrl: 'ezopen://open.ys7.com/G75922040/1.rec',
// }, // },
@ -393,12 +393,13 @@ const VideoPlay = ({ dispatch, actions,
debug: true, debug: true,
showBandwidth: false, // 显示网速 showBandwidth: false, // 显示网速
operateBtns: { operateBtns: {
fullscreen: true, fullscreen: false,
screenshot: false, screenshot: false,
play: false, play: false,
audio: false, audio: false,
}, },
forceNoOffscreen: false, forceNoOffscreen: false,
controlAutoHide:true,
isNotMute: false, isNotMute: false,
}); });
setjessibuca(jessibuca) setjessibuca(jessibuca)

4
code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
View File

@ -87,7 +87,7 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
}}> }}>
<Row> <Row>
<Col span={videoStyle == 'true' ? histroyTime.length ? 3 : 0 : 9} style={{ <Col span={videoStyle == 'true' ? histroyTime.length ? 3 : 0 : 9} style={{
backgroundImage: content && content?.length > 0 ? 'url(/assets/images/background/videoPlayBg.png)' : '', backgroundImage: videoStyle == 'true' ? "" : 'url(/assets/images/background/videoPlayBg.png)',
backgroundSize: '100% 100%', backgroundSize: '100% 100%',
backgroundRepeat: 'no-repeat', backgroundRepeat: 'no-repeat',
padding: '0 12px' padding: '0 12px'
@ -103,7 +103,7 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
'' : `${showTime_} ${name || ''}` '' : `${showTime_} ${name || ''}`
} }
</Col> </Col>
<Col span={videoStyle == 'true' ? histroyTime.length ? 21 : 24 : vcmp_videopla > 480?15:10} style={{}}> <Col span={videoStyle == 'true' ? histroyTime.length ? 21 : 24 : vcmp_videopla > 480 ? 15 : 10} style={{}}>
<div style={{ paddingRight: 12 }}> <div style={{ paddingRight: 12 }}>
{content && content?.length > 0 ? <TextScroll content={content || []} duration={6} videoObj={videoObj} /> : ""} {content && content?.length > 0 ? <TextScroll content={content || []} duration={6} videoObj={videoObj} /> : ""}
</div> </div>

6
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
View File

@ -96,7 +96,7 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
}} }}
initValues={{ initValues={{
name: cameraData.name || "", name: cameraData.name || "",
highDefinition: cameraData?.highDefinition || "", highDefinition: cameraData?.highDefinition,
memoryCard: cameraData.memoryCard || "", memoryCard: cameraData.memoryCard || "",
position: cameraData.longitude position: cameraData.longitude
? `${cameraData.longitude},${cameraData.latitude}` ? `${cameraData.longitude},${cameraData.latitude}`
@ -106,8 +106,8 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
? cameraData.cameraAbilities.map((item) => item.id) ? cameraData.cameraAbilities.map((item) => item.id)
: "" : ""
, ,
cloudControl: cameraData.cloudControl || "", cloudControl: cameraData.cloudControl,
voice: cameraData.voice || "", voice: cameraData.voice,
serialNo: cameraData.serialNo || "", serialNo: cameraData.serialNo || "",
channelNo: cameraData.channelNo || "", channelNo: cameraData.channelNo || "",
// rtmp: cameraData.rtmp || "", // rtmp: cameraData.rtmp || "",

4
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx
View File

@ -109,9 +109,9 @@ function ipcCamera ({
: "", : "",
kindId: cameraData.kindId || "", kindId: cameraData.kindId || "",
abilityId: cameraData.cameraAbilities ? cameraData.cameraAbilities.map((item) => item.id) : "", abilityId: cameraData.cameraAbilities ? cameraData.cameraAbilities.map((item) => item.id) : "",
cloudControl: cameraData.cloudControl || "", cloudControl: cameraData.cloudControl,
voice: cameraData.voice || "", voice: cameraData.voice || "",
serialNo: cameraData.serialNo || "", serialNo: cameraData.serialNo,
rtmp: "此处无效 自动生成", rtmp: "此处无效 自动生成",
// rtmp: cameraData.rtmp || "", // rtmp: cameraData.rtmp || "",
}} }}

5
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx
View File

@ -138,6 +138,7 @@ function SideSheets (props) {
rowId rowId
) )
).then((res) => { ).then((res) => {
if(res?.success){
setNvrDetails(res.payload.data); setNvrDetails(res.payload.data);
projectScrollbar = new PerfectScrollbar("#project_information", { projectScrollbar = new PerfectScrollbar("#project_information", {
suppressScrollX: true, suppressScrollX: true,
@ -146,6 +147,8 @@ function SideSheets (props) {
suppressScrollX: true, suppressScrollX: true,
}); });
}
}); });
}, []); }, []);
@ -180,7 +183,7 @@ function SideSheets (props) {
<SideSheet <SideSheet
visible={visible} visible={visible}
title={cameraSetup ? title={cameraSetup ?
<><img src={`/assets/images/background/${nvrDetails.forbidden ? "red" : colorStatus(statusNvr ? statusCamera.online : "")}.png`} style={{ marginRight: "10px" }} />{nvrDetails?.name}</> <><img src={`/assets/images/background/${nvrDetails.forbidden ? "red" : colorStatus(statusNvr ? statusCamera?.online : "")}.png`} style={{ marginRight: "10px" }} />{nvrDetails?.name}</>
: <><img src={`/assets/images/background/${colorStatus(statusCamera ? statusNvr.online : "")}.png`} style={{ marginRight: "10px" }} />{nvrDetails?.name}</> : <><img src={`/assets/images/background/${colorStatus(statusCamera ? statusNvr.online : "")}.png`} style={{ marginRight: "10px" }} />{nvrDetails?.name}</>
} }
style={{ background: "#F9FBFF" }} style={{ background: "#F9FBFF" }}

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

@ -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 http://221.230.55.27:8081", "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 http://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"

Write Preview
Loading…
Cancel
Save