From 00b0ec55e1b0eef82b3a31166e8273ecea776568 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 19 十月 2024 14:34:51 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 85 ++++++++++++++++++------------------------
1 files changed, 37 insertions(+), 48 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index c4dbdd1..1564c27 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';
@@ -31,6 +21,7 @@
import ConfirmButton from "../page/components/ConfirmButton";
import { FitScreen } from '@mui/icons-material';
import MapSearch from "./header/MapSearch";
+import { startupOrShutdown } from "./http";
let player;
let websocket;
@@ -58,6 +49,7 @@
const prevCurSpriteRef = useRef();
const [batchSprites, setBatchSprites] = useState([]);
+ const [rcsStatus, setRcsStatus] = useState(null);
const [curZone, setCurZone] = useState(() => {
const storedValue = localStorage.getItem('curZone');
return storedValue !== null ? JSON.parse(storedValue) : null;
@@ -83,16 +75,17 @@
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));
+ Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
}
- setDataFetched(true);
- setMode(MAP_MODE.OBSERVER_MODE);
+
setTimeout(() => {
- player.adaptScreen();
notify.info(translate('page.map.welcome'));
+ player.adaptScreen();
+ setDataFetched(true);
+ setMode(MAP_MODE.OBSERVER_MODE);
}, 200)
}
initialize();
@@ -139,7 +132,7 @@
player.hideStarryBackground();
player.activateMapMultiSelect((selectedSprites, restartFn) => {
- setBatchSprites(selectedSprites);
+ Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites);
});
mapContainer.children.forEach(child => {
@@ -165,7 +158,7 @@
// player.showStarryBackground(); // 0x2f68ac
player.activateMapMultiSelect((selectedSprites, restartFn) => {
- setBatchSprites(selectedSprites);
+ Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites);
});
mapContainer.children.forEach(child => {
@@ -205,15 +198,17 @@
}
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)
+ Tool.showSelectedEffect(curSprite);
+ setSettingsVisible(true);
}
} else {
Tool.removeSelectedEffect();
+ setInsightVisible(false);
+ setSettingsVisible(false);
}
}, [curSprite]);
const prevCurSprite = prevCurSpriteRef.current;
@@ -230,14 +225,6 @@
setBatchSelectionVisible(false)
}
}, [batchSprites])
-
- const actions = [
- { icon: <FileCopyIcon />, name: '澶嶅埗' },
- { icon: <SaveIcon />, name: '淇濆瓨' },
- { icon: <PrintIcon />, name: '鎵撳嵃' },
- { icon: <ShareIcon />, name: '鍒嗕韩' },
- { icon: <EditIcon />, name: '缂栬緫' },
- ];
return (
<Box
@@ -276,10 +263,15 @@
<>
<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')}
@@ -362,6 +354,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
@@ -382,20 +388,6 @@
height: '100%',
}} />
</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={{
@@ -425,7 +417,6 @@
open={insightVisible}
onCancel={() => {
setCurSprite(null);
- setInsightVisible(false);
}}
sprite={curSprite}
width={570}
@@ -444,7 +435,6 @@
open={settingsVisible}
onCancel={() => {
setCurSprite(null);
- setSettingsVisible(false);
}}
sprite={curSprite}
setSpriteSettings={setCurSprite}
@@ -455,7 +445,6 @@
open={batchSelectionVisible}
onCancel={() => {
setBatchSprites([]);
- setBatchSelectionVisible(false);
}}
batchSprites={batchSprites}
mode={mode}
--
Gitblit v1.9.1