From 566392943866d7cf90ded0d5a67660caf51af022 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 十一月 2024 14:32:52 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 181 ++++++++++++++++++++++-----------------------
1 files changed, 89 insertions(+), 92 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 9fede93..ba9ebb1 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -5,19 +5,9 @@
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';
@@ -29,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;
@@ -47,7 +40,7 @@
const [app, setApp] = useState(null);
const [mapContainer, setMapContainer] = useState(null);
- const [mode, setMode] = useState(null);
+ const [mode, setMode] = useState(MAP_MODE.OBSERVER_MODE);
const [dataFetched, setDataFetched] = useState(false);
const [insightVisible, setInsightVisible] = useState(false);
const [deviceVisible, setDeviceVisible] = useState(false);
@@ -55,11 +48,10 @@
const [batchSelectionVisible, setBatchSelectionVisible] = useState(false);
const [curSprite, setCurSprite] = useState(null);
- const prevCurSpriteRef = useRef();
- const [spriteSettings, setSpriteSettings] = useState(null);
- const prevSpriteSettingsRef = 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;
@@ -85,18 +77,17 @@
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), () => {
- setDataFetched(true);
- setMode(MAP_MODE.OBSERVER_MODE);
- });
+ Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
}
+ player.rotateMap(localStorage.getItem('mapRotation'));
setTimeout(() => {
- player.adaptScreen();
notify.info(translate('page.map.welcome'));
+ player.adaptScreen();
+ setDataFetched(true);
}, 200)
}
initialize();
@@ -113,6 +104,7 @@
player.destroy();
window.removeEventListener('resize', handleResize);
Tool.patchRaLayout('');
+ Tool.isF
};
}, [])
@@ -127,6 +119,7 @@
const switchMode = (mode) => {
Tool.removeSelectedEffect();
+ player.hideGridLines();
setInsightVisible(false);
setDeviceVisible(false);
@@ -134,16 +127,12 @@
setBatchSelectionVisible(false);
setCurSprite(null);
- setSpriteSettings(null);
setBatchSprites([]);
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 => {
@@ -152,7 +141,7 @@
break
case MAP_MODE.MOVABLE_MODE:
player.showGridLines();
- player.hideStarryBackground();
+ Tool.hideRoutes(curZone, setShowRoutes);
player.activateMapMultiSelect((selectedSprites, restartFn) => {
Tool.spriteListBeMovable(selectedSprites, () => {
@@ -165,15 +154,12 @@
})
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
default:
@@ -203,38 +189,22 @@
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)
- setInsightVisible(true)
+ Tool.showSelectedEffect(curSprite);
+ setInsightVisible(true);
+ }
+ if (mode === MAP_MODE.SETTINGS_MODE) {
+ Tool.showSelectedEffect(curSprite);
+ setSettingsVisible(true);
}
} else {
Tool.removeSelectedEffect();
+ setInsightVisible(false);
+ setSettingsVisible(false);
}
}, [curSprite]);
- const prevCurSprite = prevCurSpriteRef.current;
-
- // watch spriteSettings
- useEffect(() => {
- if (!mapContainer) {
- return;
- }
- prevSpriteSettingsRef.current = spriteSettings;
- if (spriteSettings && prevSpriteSettings !== spriteSettings) {
- Tool.removeSelectedEffect();
- }
- if (spriteSettings) {
- Tool.showSelectedEffect(spriteSettings)
- setSettingsVisible(true);
- } else {
- Tool.removeSelectedEffect();
- }
- }, [spriteSettings, mapContainer])
- const prevSpriteSettings = prevSpriteSettingsRef.current;
// watch batchSprites
React.useEffect(() => {
@@ -248,14 +218,6 @@
setBatchSelectionVisible(false)
}
}, [batchSprites])
-
- const actions = [
- { icon: <FileCopyIcon />, name: '澶嶅埗' },
- { icon: <SaveIcon />, name: '淇濆瓨' },
- { icon: <PrintIcon />, name: '鎵撳嵃' },
- { icon: <ShareIcon />, name: '鍒嗕韩' },
- { icon: <EditIcon />, name: '缂栬緫' },
- ];
return (
<Box
@@ -287,19 +249,30 @@
curZone={curZone}
curSprite={curSprite}
setCurSprite={setCurSprite}
- spriteSettings={spriteSettings}
- setSpriteSettings={setSpriteSettings}
/>
<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')}
@@ -382,6 +355,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
@@ -403,20 +390,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',
@@ -424,19 +397,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>
@@ -445,7 +445,6 @@
open={insightVisible}
onCancel={() => {
setCurSprite(null);
- setInsightVisible(false);
}}
sprite={curSprite}
width={570}
@@ -463,11 +462,10 @@
<Settings
open={settingsVisible}
onCancel={() => {
- setSpriteSettings(null);
- setSettingsVisible(false);
+ setCurSprite(null);
}}
- sprite={spriteSettings}
- setSpriteSettings={setSpriteSettings}
+ sprite={curSprite}
+ setSpriteSettings={setCurSprite}
width={570}
/>
@@ -475,7 +473,6 @@
open={batchSelectionVisible}
onCancel={() => {
setBatchSprites([]);
- setBatchSelectionVisible(false);
}}
batchSprites={batchSprites}
mode={mode}
--
Gitblit v1.9.1