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 | 158 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 132 insertions(+), 26 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index e1e916c..4981505 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -8,21 +8,27 @@
useTheme,
Fab,
} from '@mui/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, AltRoute, RotateRight } 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;
@@ -39,19 +45,23 @@
const [app, setApp] = useState(null);
const [mapContainer, setMapContainer] = useState(null);
- const [mode, setMode] = 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 [curSprite, setCurSprite] = useState(null);
- const prevCurSpriteRef = useRef();
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;
@@ -77,18 +87,19 @@
Http.setMapContainer(player.mapContainer);
websocket = new WebSocketClient('/ws/map/websocket');
- await Http.fetchMapData(curZone, setRcsStatus);
+ await Http.fetchMapData(curZone, setRcsStatus, setCurSprite);
websocket.connect();
websocket.onMessage = (wsMsg) => {
- Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
+ if (modeRef.current === MAP_MODE.OBSERVER_MODE) {
+ Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
+ }
}
- player.rotateMap(localStorage.getItem('mapRotation'));
+ player.rotateMap(localStorage.getItem('mapRotation') || Tool.rotationParseNum(MAP_DEFAULT_ROTATION));
setTimeout(() => {
notify.info(translate('page.map.welcome'));
player.adaptScreen();
setDataFetched(true);
- setMode(MAP_MODE.OBSERVER_MODE);
}, 200)
}
initialize();
@@ -105,7 +116,6 @@
player.destroy();
window.removeEventListener('resize', handleResize);
Tool.patchRaLayout('');
- Tool.isF
};
}, [])
@@ -119,16 +129,26 @@
}, [themeMode])
const switchMode = (mode) => {
+ 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);
setCurSprite(null);
setBatchSprites([]);
+
+ player.deactivateMapMultiSelect();
switch (mode) {
case MAP_MODE.OBSERVER_MODE:
@@ -163,6 +183,11 @@
Tool.beSettings(child, setCurSprite);
})
break
+ case MAP_MODE.AREA_MODE:
+ Tool.removeAgvGraphics();
+
+ Tool.loadAreas(curZone, setCurSprite);
+ break
default:
break
}
@@ -180,6 +205,9 @@
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);
@@ -190,10 +218,8 @@
if (!mapContainer) {
return;
}
- prevCurSpriteRef.current = curSprite;
- if (curSprite && prevCurSprite !== curSprite) {
- Tool.removeSelectedEffect();
- }
+ setAreaListVisible(false);
+ Tool.removeSelectedEffect();
if (curSprite) {
if (mode === MAP_MODE.OBSERVER_MODE) {
Tool.showSelectedEffect(curSprite);
@@ -203,13 +229,17 @@
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);
}
}, [curSprite]);
- const prevCurSprite = prevCurSpriteRef.current;
// watch batchSprites
React.useEffect(() => {
@@ -282,6 +312,7 @@
<Button variant="contained" color="primary">
{translate('page.map.action.monitor')}
</Button>
+ <MoreOperate />
</>
)}
@@ -335,6 +366,53 @@
</>
)}
+ {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 ?? ''}
onChange={(event) => {
@@ -352,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 */}
@@ -405,17 +484,26 @@
gap: 2
}}
>
+ {mode === MAP_MODE.OBSERVER_MODE && (
+ <>
+ <AreaFab
+ curZone={curZone}
+ showAreas={showAreas}
+ setShowAreas={setShowAreas}
+ notify={notify}
+ />
+ </>
+ )}
{mode !== MAP_MODE.MOVABLE_MODE && (
- <Fab
- variant="extended"
- color={showRoutes ? 'primary' : 'default'}
- size="small"
- onClick={() => {
- showRoutes ? Tool.hideRoutes(curZone, setShowRoutes) : Tool.showRoutes(curZone, setShowRoutes)
- }}
- >
- <AltRoute />
- </Fab>
+ <>
+ <RouteFab
+ curZone={curZone}
+ showRoutes={showRoutes}
+ setShowRoutes={setShowRoutes}
+ notify={notify}
+ />
+ <FakeFab />
+ </>
)}
<Fab
variant="extended"
@@ -426,7 +514,7 @@
}}
>
<RotateRight />
- {/* {translate('page.map.action.adapt')} */}
+ {translate('page.map.action.rotate')}
</Fab>
<Fab
variant="extended"
@@ -437,7 +525,7 @@
}}
>
<FitScreen />
- {/* {translate('page.map.action.adapt')} */}
+ {translate('page.map.action.adapt')}
</Fab>
</Box>
</Box>
@@ -480,6 +568,24 @@
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