Browse Source

播放完成

release_0.0.2
wenlele 3 years ago
parent
commit
feb1824eed
  1. 1
      code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
  2. 4
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx
  3. 6
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx
  4. 22
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx

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

@ -27,6 +27,7 @@ const VideoPlay = ({
// replayUrl: 'ezopen://open.ys7.com/G75922040/1.rec', // replayUrl: 'ezopen://open.ys7.com/G75922040/1.rec',
}, },
}) => { }) => {
console.log(videoObj);
const [jessibuca, setjessibuca] = useState(null) const [jessibuca, setjessibuca] = useState(null)
const [isPlaying, setIsPlaying] = useState(false) const [isPlaying, setIsPlaying] = useState(false)
const [operationState, setoperationState] = useState() const [operationState, setoperationState] = useState()

4
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx

@ -55,10 +55,11 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }
).then((res) => { ).then((res) => {
let oneData = res.payload.data[0]; let oneData = res.payload.data[0];
let modifyData = res.payload.data.find( let modifyData = res.payload.data.find(
(item) =>item.id == cameraData.gbId); (item) => item.id == cameraData.gbId);
let data = res.payload.data.map((item, index) => { let data = res.payload.data.map((item, index) => {
if (item.camera) { if (item.camera) {
item.name = item.camera.name; item.name = item.camera.name;
item.support = item.camera.cloudControl
} }
if (item.id == cameraData.gbId) { if (item.id == cameraData.gbId) {
item = oneData; item = oneData;
@ -66,6 +67,7 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }
if (index == 0) { if (index == 0) {
item = modifyData; item = modifyData;
} }
return item; return item;
}); });
setNVRcameraList(data); setNVRcameraList(data);

6
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx

@ -138,6 +138,7 @@ function SideSheets (props) {
rowId rowId
) )
).then((res) => { ).then((res) => {
console.log(res.payload.data);
setNvrDetails(res.payload.data); setNvrDetails(res.payload.data);
projectScrollbar = new PerfectScrollbar("#project_information", { projectScrollbar = new PerfectScrollbar("#project_information", {
suppressScrollX: true, suppressScrollX: true,
@ -163,6 +164,7 @@ function SideSheets (props) {
const statusNvr = nvrDetails.gbNvr const statusNvr = nvrDetails.gbNvr
const statusCamera = nvrDetails.gbCamera const statusCamera = nvrDetails.gbCamera
console.log();
function colorStatus (data) { function colorStatus (data) {
switch (data) { switch (data) {
case "ON": case "ON":
@ -179,8 +181,8 @@ function SideSheets (props) {
<SideSheet <SideSheet
visible={visible} visible={visible}
title={cameraSetup ? title={cameraSetup ?
<><img src={`/assets/images/background/${nvrDetails.forbidden ? "red" : colorStatus(statusNvr ? statusNvr.online : "")}.png`} style={{ marginRight: "10px" }} />污水管理出出口</> <><img src={`/assets/images/background/${nvrDetails.forbidden ? "red" : colorStatus(statusNvr ? statusCamera.online : "")}.png`} style={{ marginRight: "10px" }} />污水管理出出口</>
: <><img src={`/assets/images/background/${colorStatus(statusCamera ? statusCamera.online : "")}.png`} style={{ marginRight: "10px" }} />智慧设备NVR</> : <><img src={`/assets/images/background/${colorStatus(statusCamera ? statusNvr.online : "")}.png`} style={{ marginRight: "10px" }} />智慧设备NVR</>
} }
style={{ background: "#F9FBFF" }} style={{ background: "#F9FBFF" }}
size="large" size="large"

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

@ -11,6 +11,7 @@ import {
Tag, Tag,
Skeleton, Skeleton,
Popconfirm, Popconfirm,
Row,
} from "@douyinfe/semi-ui"; } from "@douyinfe/semi-ui";
import { SimpleFileDownButton, VideoPlayModal } from "$components"; import { SimpleFileDownButton, VideoPlayModal } from "$components";
import "../style.less"; import "../style.less";
@ -38,6 +39,7 @@ const CameraHeader = (props) => {
const [parentCamera, setParentCamera] = useState(""); // const [parentCamera, setParentCamera] = useState(""); //
const [addNvr, setAddNvr] = useState(false); //nvrNVR const [addNvr, setAddNvr] = useState(false); //nvrNVR
const [nvrNumber, setNvrNumber] = useState(); const [nvrNumber, setNvrNumber] = useState();
const [videoObj, setVideoObj] = useState(); //
const [axyData, setAxyData] = useState(); const [axyData, setAxyData] = useState();
const { equipmentWarehouse } = actions; const { equipmentWarehouse } = actions;
const api = useRef(); const api = useRef();
@ -118,7 +120,7 @@ const CameraHeader = (props) => {
return ( return (
<div> <div>
{row.name} {row.name}
<span style={{ color: "blue" }} <span style={{ color: "#1859C1" }}
onClick={() => { onClick={() => {
if (deviceClickb.current) { if (deviceClickb.current) {
if (row.type == "nvr") { if (row.type == "nvr") {
@ -148,6 +150,7 @@ const CameraHeader = (props) => {
width: "20%", width: "20%",
dataIndex: "", dataIndex: "",
render: (_, row) => { render: (_, row) => {
console.log(row);
return ( return (
<div style={{ display: "flex" }}> <div style={{ display: "flex" }}>
<Button <Button
@ -184,8 +187,22 @@ const CameraHeader = (props) => {
<Button <Button
theme="borderless" theme="borderless"
onClick={() => { onClick={() => {
// setRowId(row.id); if (row.type == "yingshi") {
// console.log(row.serialNo);
// console.log(row.secretYingshi.token);
// console.log(row.gbCamera.playUrl.liveUrl.sd.ezopen);
// console.log(row.gbCamera.playUrl.liveUrl.hd.ezopen);
setVideoObj({
type:row.type,
serialNo: row.serialNo,
yingshiToken: row.secretYingshi.token,
playUrlSd: row.gbCamera.playUrl.liveUrl.sd.ezopen,
playUrlHd: row.gbCamera.playUrl.liveUrl.hd.ezopen,
})
}
setVideoPlay(true) setVideoPlay(true)
}} }}
> >
播放 播放
@ -780,6 +797,7 @@ const CameraHeader = (props) => {
{videoPlay ? {videoPlay ?
<VideoPlayModal <VideoPlayModal
visible={true} visible={true}
videoObj={videoObj}
close={() => { close={() => {
setVideoPlay(false) setVideoPlay(false)
}} /> }} />

Loading…
Cancel
Save