From 6324d391d2b0aa5b96128f5e07a612ec7ebf8c20 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 11 十一月 2024 10:35:28 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 69 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 205aadd..adfba19 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -19,8 +19,11 @@
import * as Http from './http';
import WebSocketClient from './websocket'
import ConfirmButton from "../page/components/ConfirmButton";
-import { FitScreen } from '@mui/icons-material';
+import { FitScreen, AltRoute, RotateRight } from '@mui/icons-material';
import MapSearch from "./header/MapSearch";
+import { startupOrShutdown } from "./http";
+import PulseSignal from "../page/components/PulseSignal";
+import FakeFab from "./header/FakeFab";
let player;
let websocket;
@@ -48,6 +51,8 @@
const prevCurSpriteRef = useRef();
const [batchSprites, setBatchSprites] = useState([]);
+ const [rcsStatus, setRcsStatus] = useState(null);
+ const [showRoutes, setShowRoutes] = useState(false);
const [curZone, setCurZone] = useState(() => {
const storedValue = localStorage.getItem('curZone');
return storedValue !== null ? JSON.parse(storedValue) : null;
@@ -73,12 +78,13 @@
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), setCurSprite);
}
+ player.rotateMap(localStorage.getItem('mapRotation'));
setTimeout(() => {
notify.info(translate('page.map.welcome'));
player.adaptScreen();
@@ -115,6 +121,7 @@
const switchMode = (mode) => {
Tool.removeSelectedEffect();
+ player.hideGridLines();
setInsightVisible(false);
setDeviceVisible(false);
@@ -126,9 +133,6 @@
switch (mode) {
case MAP_MODE.OBSERVER_MODE:
- player.hideGridLines();
- player.hideStarryBackground();
-
player.activateMapMultiSelect((selectedSprites, restartFn) => {
Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites);
});
@@ -139,7 +143,7 @@
break
case MAP_MODE.MOVABLE_MODE:
player.showGridLines();
- player.hideStarryBackground();
+ Tool.hideRoutes(curZone, setShowRoutes);
player.activateMapMultiSelect((selectedSprites, restartFn) => {
Tool.spriteListBeMovable(selectedSprites, () => {
@@ -152,9 +156,6 @@
})
break
case MAP_MODE.SETTINGS_MODE:
- player.hideGridLines();
- // player.showStarryBackground(); // 0x2f68ac
-
player.activateMapMultiSelect((selectedSprites, restartFn) => {
Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites);
});
@@ -259,12 +260,25 @@
{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')}
@@ -389,19 +403,46 @@
bottom: 30,
display: 'flex',
flexDirection: 'column',
- gap: 1
+ gap: 2
}}
>
+ {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>
+ <FakeFab
+ />
+ </>
+ )}
<Fab
variant="extended"
color="primary"
- size="medium"
+ size="small"
+ onClick={() => {
+ player.rotateMap(Math.PI / 2);
+ }}
+ >
+ <RotateRight />
+ {/* {translate('page.map.action.adapt')} */}
+ </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>
--
Gitblit v1.9.1