From 00b0ec55e1b0eef82b3a31166e8273ecea776568 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 19 十月 2024 14:34:51 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 132 ++++++++++++++++++++++---------------------
1 files changed, 68 insertions(+), 64 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index cd0d328..1564c27 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -1,24 +1,13 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
import { useTranslate, useRefresh, useSidebarState } from "react-admin";
import {
- TextField,
Select,
MenuItem,
Button,
Box,
- SpeedDial,
- SpeedDialAction,
useTheme,
Fab,
} from '@mui/material';
-import {
- MoreVert as MoreVertIcon,
- Edit as EditIcon,
- FileCopy as FileCopyIcon,
- Save as SaveIcon,
- Print as PrintIcon,
- Share as ShareIcon,
-} from '@mui/icons-material';
import { MAP_MODE } from "./constants";
import Player from './player';
import * as Tool from './tool';
@@ -32,6 +21,7 @@
import ConfirmButton from "../page/components/ConfirmButton";
import { FitScreen } from '@mui/icons-material';
import MapSearch from "./header/MapSearch";
+import { startupOrShutdown } from "./http";
let player;
let websocket;
@@ -48,23 +38,25 @@
const [app, setApp] = useState(null);
const [mapContainer, setMapContainer] = useState(null);
- const [mode, setMode] = useState(MAP_MODE.OBSERVER_MODE);
+ const [mode, setMode] = useState(null);
const [dataFetched, setDataFetched] = useState(false);
const [insightVisible, setInsightVisible] = useState(false);
const [deviceVisible, setDeviceVisible] = useState(false);
const [settingsVisible, setSettingsVisible] = useState(false);
const [batchSelectionVisible, setBatchSelectionVisible] = useState(false);
- const [spriteSettings, setSpriteSettings] = useState(null);
- const prevSpriteSettingsRef = useRef();
+ const [curSprite, setCurSprite] = useState(null);
+ const prevCurSpriteRef = useRef();
const [batchSprites, setBatchSprites] = useState([]);
+ const [rcsStatus, setRcsStatus] = useState(null);
const [curZone, setCurZone] = useState(() => {
const storedValue = localStorage.getItem('curZone');
return storedValue !== null ? JSON.parse(storedValue) : null;
});
const handleResize = () => {
+ if (!contentRef) { return; }
const width = contentRef.current.offsetWidth;
const height = contentRef.current.offsetHeight;
player.resize(width, height);
@@ -83,15 +75,17 @@
Http.setMapContainer(player.mapContainer);
websocket = new WebSocketClient('/ws/map/websocket');
- await Http.fetchMapData();
+ await Http.fetchMapData(curZone, setRcsStatus);
websocket.connect();
websocket.onMessage = (wsMsg) => {
- Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg));
+ Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
}
- setDataFetched(true);
+
setTimeout(() => {
- player.adaptScreen();
notify.info(translate('page.map.welcome'));
+ player.adaptScreen();
+ setDataFetched(true);
+ setMode(MAP_MODE.OBSERVER_MODE);
}, 200)
}
initialize();
@@ -108,6 +102,7 @@
player.destroy();
window.removeEventListener('resize', handleResize);
Tool.patchRaLayout('');
+ Tool.isF
};
}, [])
@@ -123,11 +118,12 @@
const switchMode = (mode) => {
Tool.removeSelectedEffect();
+ setInsightVisible(false);
setDeviceVisible(false);
setSettingsVisible(false);
setBatchSelectionVisible(false);
- setSpriteSettings(null);
+ setCurSprite(null);
setBatchSprites([]);
switch (mode) {
@@ -136,9 +132,12 @@
player.hideStarryBackground();
player.activateMapMultiSelect((selectedSprites, restartFn) => {
- setBatchSprites(selectedSprites);
+ Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites);
});
+ mapContainer.children.forEach(child => {
+ Tool.beInsight(child, setCurSprite);
+ })
break
case MAP_MODE.MOVABLE_MODE:
player.showGridLines();
@@ -159,11 +158,11 @@
// player.showStarryBackground(); // 0x2f68ac
player.activateMapMultiSelect((selectedSprites, restartFn) => {
- setBatchSprites(selectedSprites);
+ Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites);
});
mapContainer.children.forEach(child => {
- Tool.beSettings(child, setSpriteSettings);
+ Tool.beSettings(child, setCurSprite);
})
break
default:
@@ -188,23 +187,31 @@
Tool.beMovable(sprite);
};
- // watch spriteSettings
- useEffect(() => {
+ // watch curSprite
+ React.useEffect(() => {
if (!mapContainer) {
return;
}
- prevSpriteSettingsRef.current = spriteSettings;
- if (spriteSettings && prevSpriteSettings !== spriteSettings) {
+ prevCurSpriteRef.current = curSprite;
+ if (curSprite && prevCurSprite !== curSprite) {
Tool.removeSelectedEffect();
}
- if (spriteSettings) {
- Tool.showSelectedEffect(spriteSettings)
- setSettingsVisible(true);
+ if (curSprite) {
+ if (mode === MAP_MODE.OBSERVER_MODE) {
+ Tool.showSelectedEffect(curSprite);
+ setInsightVisible(true);
+ }
+ if (mode === MAP_MODE.SETTINGS_MODE) {
+ Tool.showSelectedEffect(curSprite);
+ setSettingsVisible(true);
+ }
} else {
Tool.removeSelectedEffect();
+ setInsightVisible(false);
+ setSettingsVisible(false);
}
- }, [spriteSettings, mapContainer])
- const prevSpriteSettings = prevSpriteSettingsRef.current;
+ }, [curSprite]);
+ const prevCurSprite = prevCurSpriteRef.current;
// watch batchSprites
React.useEffect(() => {
@@ -218,14 +225,6 @@
setBatchSelectionVisible(false)
}
}, [batchSprites])
-
- const actions = [
- { icon: <FileCopyIcon />, name: '澶嶅埗' },
- { icon: <SaveIcon />, name: '淇濆瓨' },
- { icon: <PrintIcon />, name: '鎵撳嵃' },
- { icon: <ShareIcon />, name: '鍒嗕韩' },
- { icon: <EditIcon />, name: '缂栬緫' },
- ];
return (
<Box
@@ -255,7 +254,8 @@
setMode={setMode}
dataFetched={dataFetched}
curZone={curZone}
- setSpriteSettings={setSpriteSettings}
+ curSprite={curSprite}
+ setCurSprite={setCurSprite}
/>
<Box sx={{ flexGrow: 1 }} />
@@ -263,10 +263,15 @@
<>
<Button
variant="contained"
- color="primary"
+ color={rcsStatus ? 'inherit' : 'primary'}
sx={{ mr: 2 }}
+ onClick={() => {
+ startupOrShutdown(() => {
+ setRcsStatus(!rcsStatus);
+ });
+ }}
>
- {translate('page.map.action.startup')}
+ {rcsStatus ? translate('page.map.action.shutdown') : translate('page.map.action.startup')}
</Button>
<Button variant="contained" color="primary">
{translate('page.map.action.monitor')}
@@ -325,7 +330,7 @@
)}
<Select
- value={mode}
+ value={mode ?? ''}
onChange={(event) => {
setMode(event.target.value);
}}
@@ -349,6 +354,20 @@
flexGrow: 1, // fill remaining of map space
position: 'relative',
backgroundColor: '#fff',
+ ...(mode === MAP_MODE.SETTINGS_MODE && {
+ animation: 'settingsPulse 1.5s infinite',
+ '@keyframes settingsPulse': {
+ '0%': {
+ boxShadow: `0 0 3px 1px ${theme.palette.primary.main.replace('rgb', 'rgba').replace(')', `, 0.1)`)}`,
+ },
+ '50%': {
+ boxShadow: `0 0 8px 3px ${theme.palette.primary.main.replace('rgb', 'rgba').replace(')', `, 0.5)`)}`,
+ },
+ '100%': {
+ boxShadow: `0 0 3px 1px ${theme.palette.primary.main.replace('rgb', 'rgba').replace(')', `, 0.1)`)}`,
+ },
+ },
+ })
}}
>
<Box
@@ -369,20 +388,6 @@
height: '100%',
}} />
</Box>
-
- {/* <SpeedDial
- ariaLabel="SpeedDial 绀轰緥"
- sx={{ position: 'absolute', bottom: 16, right: 16 }}
- icon={<MoreVertIcon />}
- >
- {actions.map((action) => (
- <SpeedDialAction
- key={action.name}
- icon={action.icon}
- tooltipTitle={action.name}
- />
- ))}
- </SpeedDial> */}
<Box
sx={{
@@ -411,9 +416,10 @@
<Insight
open={insightVisible}
onCancel={() => {
- setInsightVisible(false);
+ setCurSprite(null);
}}
- width={378}
+ sprite={curSprite}
+ width={570}
/>
<Device
@@ -428,11 +434,10 @@
<Settings
open={settingsVisible}
onCancel={() => {
- setSpriteSettings(null);
- setSettingsVisible(false);
+ setCurSprite(null);
}}
- sprite={spriteSettings}
- setSpriteSettings={setSpriteSettings}
+ sprite={curSprite}
+ setSpriteSettings={setCurSprite}
width={570}
/>
@@ -440,7 +445,6 @@
open={batchSelectionVisible}
onCancel={() => {
setBatchSprites([]);
- setBatchSelectionVisible(false);
}}
batchSprites={batchSprites}
mode={mode}
--
Gitblit v1.9.1