From d69e981de04bce23f1963f2e2a7c8c47bb26eceb Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 10 十二月 2025 08:29:57 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 94 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 68 insertions(+), 26 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index e1e916c..044df1d 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -8,7 +8,7 @@
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';
@@ -19,10 +19,13 @@
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 MoreOperate from "./header/MoreOperate";
let player;
let websocket;
@@ -39,15 +42,16 @@
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 [areaDrawing, setAreaDrawing] = useState(false);
const [curSprite, setCurSprite] = useState(null);
- const prevCurSpriteRef = useRef();
const [batchSprites, setBatchSprites] = useState([]);
const [rcsStatus, setRcsStatus] = useState(null);
@@ -77,18 +81,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 +110,6 @@
player.destroy();
window.removeEventListener('resize', handleResize);
Tool.patchRaLayout('');
- Tool.isF
};
}, [])
@@ -119,7 +123,10 @@
}, [themeMode])
const switchMode = (mode) => {
+ modeRef.current = mode;
+
Tool.removeSelectedEffect();
+ Tool.clearAreas();
player.hideGridLines();
setInsightVisible(false);
@@ -163,6 +170,11 @@
Tool.beSettings(child, setCurSprite);
})
break
+ case MAP_MODE.AREA_MODE:
+ Tool.removeAgvGraphics();
+
+ Tool.loadAreas(curZone);
+ break
default:
break
}
@@ -180,6 +192,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 +205,7 @@
if (!mapContainer) {
return;
}
- prevCurSpriteRef.current = curSprite;
- if (curSprite && prevCurSprite !== curSprite) {
- Tool.removeSelectedEffect();
- }
+ Tool.removeSelectedEffect();
if (curSprite) {
if (mode === MAP_MODE.OBSERVER_MODE) {
Tool.showSelectedEffect(curSprite);
@@ -209,7 +221,6 @@
setSettingsVisible(false);
}
}, [curSprite]);
- const prevCurSprite = prevCurSpriteRef.current;
// watch batchSprites
React.useEffect(() => {
@@ -282,6 +293,7 @@
<Button variant="contained" color="primary">
{translate('page.map.action.monitor')}
</Button>
+ <MoreOperate />
</>
)}
@@ -335,6 +347,36 @@
</>
)}
+ {mode === MAP_MODE.AREA_MODE && (
+ <>
+ <Button
+ variant={areaDrawing ? "outlined" : "contained"}
+ color="primary"
+ sx={{}}
+ disabled={areaDrawing}
+ onClick={() => {
+ const started = Tool.startAreaDrawing({
+ promptText: translate('page.map.prompt.areaName'),
+ onComplete: ({ name, start, end, color }) => {
+ if (name) {
+ Http.saveAreaData(curZone, { name, start, end, color });
+ notify.success(translate('page.map.msg.areaCreated', { name }));
+ }
+ },
+ onFinish: () => {
+ setAreaDrawing(false);
+ }
+ });
+ if (started) {
+ setAreaDrawing(true);
+ }
+ }}
+ >
+ {translate('page.map.action.addArea')}
+ </Button>
+ </>
+ )}
+
<Select
value={mode ?? ''}
onChange={(event) => {
@@ -352,6 +394,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 */}
@@ -406,16 +449,15 @@
}}
>
{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 +468,7 @@
}}
>
<RotateRight />
- {/* {translate('page.map.action.adapt')} */}
+ {translate('page.map.action.rotate')}
</Fab>
<Fab
variant="extended"
@@ -437,7 +479,7 @@
}}
>
<FitScreen />
- {/* {translate('page.map.action.adapt')} */}
+ {translate('page.map.action.adapt')}
</Fab>
</Box>
</Box>
--
Gitblit v1.9.1