From 1bc33546a044cbc84dd9595c19dbcd9a4e309fc9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期六, 10 一月 2026 14:06:10 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 295 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 217 insertions(+), 78 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index cd0d328..4981505 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -1,37 +1,34 @@
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 { MAP_MODE, MAP_DEFAULT_ROTATION } from "./constants";
import Player from './player';
import * as Tool from './tool';
import { NotificationProvider, useNotification } from './Notification';
import Insight from "./insight";
import Device from "./Device";
+import AreaList from "./AreaList";
import Settings from "./settings";
import Batch from "./batch";
+import AreaSettings from "./areaSettings";
import * as Http from './http';
import WebSocketClient from './websocket'
import ConfirmButton from "../page/components/ConfirmButton";
-import { FitScreen } from '@mui/icons-material';
+import { FitScreen, RotateRight, Flip } from '@mui/icons-material';
import MapSearch from "./header/MapSearch";
+import { startupOrShutdown } from "./http";
+import PulseSignal from "../page/components/PulseSignal";
+import FakeFab from "./header/FakeFab";
+import RouteFab from "./header/RouteFab";
+import AreaFab from "./header/AreaFab";
+import MoreOperate from "./header/MoreOperate";
let player;
let websocket;
@@ -49,22 +46,29 @@
const [mapContainer, setMapContainer] = useState(null);
const [mode, setMode] = useState(MAP_MODE.OBSERVER_MODE);
+ const modeRef = useRef(mode);
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 [areaSettingsVisible, setAreaSettingsVisible] = useState(false);
+ const [areaListVisible, setAreaListVisible] = useState(false);
+ const [areaDrawing, setAreaDrawing] = useState(false);
- const [spriteSettings, setSpriteSettings] = useState(null);
- const prevSpriteSettingsRef = useRef();
+ const [curSprite, setCurSprite] = useState(null);
const [batchSprites, setBatchSprites] = useState([]);
+ const [rcsStatus, setRcsStatus] = useState(null);
+ const [showRoutes, setShowRoutes] = useState(false);
+ const [showAreas, setShowAreas] = useState(false);
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 +87,19 @@
Http.setMapContainer(player.mapContainer);
websocket = new WebSocketClient('/ws/map/websocket');
- await Http.fetchMapData();
+ await Http.fetchMapData(curZone, setRcsStatus, setCurSprite);
websocket.connect();
websocket.onMessage = (wsMsg) => {
- Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg));
+ if (modeRef.current === MAP_MODE.OBSERVER_MODE) {
+ Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
+ }
}
- setDataFetched(true);
+
+ player.rotateMap(localStorage.getItem('mapRotation') || Tool.rotationParseNum(MAP_DEFAULT_ROTATION));
setTimeout(() => {
- player.adaptScreen();
notify.info(translate('page.map.welcome'));
+ player.adaptScreen();
+ setDataFetched(true);
}, 200)
}
initialize();
@@ -121,28 +129,40 @@
}, [themeMode])
const switchMode = (mode) => {
- Tool.removeSelectedEffect();
+ modeRef.current = mode;
+ Tool.removeSelectedEffect();
+ Tool.clearAreas();
+ player.hideGridLines();
+
+ setInsightVisible(false);
setDeviceVisible(false);
setSettingsVisible(false);
setBatchSelectionVisible(false);
+ setAreaSettingsVisible(false);
+ setAreaDrawing(false);
+ setAreaListVisible(false);
+ Tool.cancelAreaDrawing();
+ Tool.hideAreas(curZone, setShowAreas);
- setSpriteSettings(null);
+ setCurSprite(null);
setBatchSprites([]);
+
+ player.deactivateMapMultiSelect();
switch (mode) {
case MAP_MODE.OBSERVER_MODE:
- player.hideGridLines();
- 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();
- player.hideStarryBackground();
+ Tool.hideRoutes(curZone, setShowRoutes);
player.activateMapMultiSelect((selectedSprites, restartFn) => {
Tool.spriteListBeMovable(selectedSprites, () => {
@@ -155,16 +175,18 @@
})
break
case MAP_MODE.SETTINGS_MODE:
- player.hideGridLines();
- // 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
+ case MAP_MODE.AREA_MODE:
+ Tool.removeAgvGraphics();
+
+ Tool.loadAreas(curZone, setCurSprite);
break
default:
break
@@ -183,28 +205,41 @@
sprite.x = mapX;
sprite.y = mapY;
+ // sprite.scale.set(mapContainer.scale.x);
+ sprite.rotation = -mapContainer.rotation;
+
Tool.initSprite(sprite, type);
mapContainer.addChild(sprite);
Tool.beMovable(sprite);
};
- // watch spriteSettings
- useEffect(() => {
+ // watch curSprite
+ React.useEffect(() => {
if (!mapContainer) {
return;
}
- prevSpriteSettingsRef.current = spriteSettings;
- if (spriteSettings && prevSpriteSettings !== spriteSettings) {
- Tool.removeSelectedEffect();
- }
- if (spriteSettings) {
- Tool.showSelectedEffect(spriteSettings)
- setSettingsVisible(true);
+ setAreaListVisible(false);
+ Tool.removeSelectedEffect();
+ if (curSprite) {
+ if (mode === MAP_MODE.OBSERVER_MODE) {
+ Tool.showSelectedEffect(curSprite);
+ setInsightVisible(true);
+ }
+ if (mode === MAP_MODE.SETTINGS_MODE) {
+ Tool.showSelectedEffect(curSprite);
+ setSettingsVisible(true);
+ }
+ if (mode === MAP_MODE.AREA_MODE) {
+ Tool.showSelectedEffect(curSprite);
+ setAreaSettingsVisible(true);
+ }
} else {
Tool.removeSelectedEffect();
+ setInsightVisible(false);
+ setSettingsVisible(false);
+ setAreaSettingsVisible(false);
}
- }, [spriteSettings, mapContainer])
- const prevSpriteSettings = prevSpriteSettingsRef.current;
+ }, [curSprite]);
// watch batchSprites
React.useEffect(() => {
@@ -218,14 +253,6 @@
setBatchSelectionVisible(false)
}
}, [batchSprites])
-
- const actions = [
- { icon: <FileCopyIcon />, name: '澶嶅埗' },
- { icon: <SaveIcon />, name: '淇濆瓨' },
- { icon: <PrintIcon />, name: '鎵撳嵃' },
- { icon: <ShareIcon />, name: '鍒嗕韩' },
- { icon: <EditIcon />, name: '缂栬緫' },
- ];
return (
<Box
@@ -255,22 +282,37 @@
setMode={setMode}
dataFetched={dataFetched}
curZone={curZone}
- setSpriteSettings={setSpriteSettings}
+ curSprite={curSprite}
+ setCurSprite={setCurSprite}
/>
<Box sx={{ flexGrow: 1 }} />
{mode === MAP_MODE.OBSERVER_MODE && (
<>
+ <Box sx={{ mr: 2, display: 'flex', alignItems: 'center' }}>
+ <PulseSignal
+ negative
+ negativeColor='#a4b0be'
+ flag={rcsStatus}
+ width={12}
+ />
+ </Box>
<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')}
</Button>
+ <MoreOperate />
</>
)}
@@ -324,8 +366,55 @@
</>
)}
+ {mode === MAP_MODE.AREA_MODE && (
+ <>
+ <Button
+ variant="outlined"
+ onClick={() => setAreaListVisible(!areaListVisible)}
+ sx={{ mr: 2 }}
+ >
+ {translate('page.map.action.areaList')}
+ </Button>
+ <Button
+ variant="contained"
+ color={areaDrawing ? "error" : "primary"}
+ onClick={() => {
+ if (areaDrawing) {
+ Tool.cancelAreaDrawing();
+ setAreaDrawing(false);
+ return;
+ }
+ setCurSprite(null);
+ const started = Tool.startAreaDrawing({
+ promptText: translate('page.map.area.prompt.nameInput'),
+ onComplete: ({ name, start, end, color, graphics }) => {
+ if (name) {
+ Http.saveAreaData(curZone, { name, start, end, color }).then((savedArea) => {
+ if (savedArea?.id && graphics?.data) {
+ graphics.data.id = savedArea.id;
+ }
+ });
+ }
+ },
+ onFinish: () => {
+ setAreaDrawing(false);
+ },
+ setCurSprite,
+ });
+ if (started) {
+ setAreaDrawing(true);
+ }
+ }}
+ >
+ {areaDrawing
+ ? translate('page.map.action.cancelAddArea')
+ : translate('page.map.action.addArea')}
+ </Button>
+ </>
+ )}
+
<Select
- value={mode}
+ value={mode ?? ''}
onChange={(event) => {
setMode(event.target.value);
}}
@@ -341,6 +430,7 @@
<MenuItem value={MAP_MODE.OBSERVER_MODE}>{translate('page.map.mode.observer')}</MenuItem>
<MenuItem value={MAP_MODE.MOVABLE_MODE}>{translate('page.map.mode.movable')}</MenuItem>
<MenuItem value={MAP_MODE.SETTINGS_MODE}>{translate('page.map.mode.settings')}</MenuItem>
+ <MenuItem value={MAP_MODE.AREA_MODE}>{translate('page.map.mode.area')}</MenuItem>
</Select>
</Box>
{/* content */}
@@ -349,6 +439,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
@@ -370,20 +474,6 @@
}} />
</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={{
position: 'absolute',
@@ -391,19 +481,51 @@
bottom: 30,
display: 'flex',
flexDirection: 'column',
- gap: 1
+ gap: 2
}}
>
+ {mode === MAP_MODE.OBSERVER_MODE && (
+ <>
+ <AreaFab
+ curZone={curZone}
+ showAreas={showAreas}
+ setShowAreas={setShowAreas}
+ notify={notify}
+ />
+ </>
+ )}
+ {mode !== MAP_MODE.MOVABLE_MODE && (
+ <>
+ <RouteFab
+ curZone={curZone}
+ showRoutes={showRoutes}
+ setShowRoutes={setShowRoutes}
+ notify={notify}
+ />
+ <FakeFab />
+ </>
+ )}
<Fab
variant="extended"
color="primary"
- size="medium"
+ size="small"
+ onClick={() => {
+ player.rotateMap(Math.PI / 2);
+ }}
+ >
+ <RotateRight />
+ {translate('page.map.action.rotate')}
+ </Fab>
+ <Fab
+ variant="extended"
+ color="primary"
+ size="small"
onClick={() => {
player.adaptScreen();
}}
>
<FitScreen />
- {translate('page.map.action.adapt')}
+ {translate('page.map.action.adapt')}
</Fab>
</Box>
</Box>
@@ -411,9 +533,10 @@
<Insight
open={insightVisible}
onCancel={() => {
- setInsightVisible(false);
+ setCurSprite(null);
}}
- width={378}
+ sprite={curSprite}
+ width={570}
/>
<Device
@@ -428,11 +551,10 @@
<Settings
open={settingsVisible}
onCancel={() => {
- setSpriteSettings(null);
- setSettingsVisible(false);
+ setCurSprite(null);
}}
- sprite={spriteSettings}
- setSpriteSettings={setSpriteSettings}
+ sprite={curSprite}
+ setSpriteSettings={setCurSprite}
width={570}
/>
@@ -440,13 +562,30 @@
open={batchSelectionVisible}
onCancel={() => {
setBatchSprites([]);
- setBatchSelectionVisible(false);
}}
batchSprites={batchSprites}
mode={mode}
width={570}
/>
+ <AreaSettings
+ open={areaSettingsVisible}
+ onCancel={() => {
+ setCurSprite(null);
+ }}
+ sprite={curSprite}
+ setSpriteSettings={setCurSprite}
+ width={570}
+ />
+
+ <AreaList
+ zoneId={curZone}
+ open={areaListVisible}
+ onClose={() => setAreaListVisible(false)}
+ setCurSprite={setCurSprite}
+ width={378}
+ />
+
</Box>
);
}
--
Gitblit v1.9.1