From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 04 十一月 2024 10:22:45 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/MapPage.jsx | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx index 1564c27..abca05b 100644 --- a/zy-acs-flow/src/map/MapPage.jsx +++ b/zy-acs-flow/src/map/MapPage.jsx @@ -19,9 +19,10 @@ import * as Http from './http'; import WebSocketClient from './websocket' import ConfirmButton from "../page/components/ConfirmButton"; -import { FitScreen } from '@mui/icons-material'; +import { FitScreen, AltRoute } from '@mui/icons-material'; import MapSearch from "./header/MapSearch"; import { startupOrShutdown } from "./http"; +import PulseSignal from "../page/components/PulseSignal"; let player; let websocket; @@ -50,6 +51,7 @@ 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; @@ -117,6 +119,7 @@ const switchMode = (mode) => { Tool.removeSelectedEffect(); + player.hideGridLines(); setInsightVisible(false); setDeviceVisible(false); @@ -128,9 +131,6 @@ switch (mode) { case MAP_MODE.OBSERVER_MODE: - player.hideGridLines(); - player.hideStarryBackground(); - player.activateMapMultiSelect((selectedSprites, restartFn) => { Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites); }); @@ -141,7 +141,7 @@ break case MAP_MODE.MOVABLE_MODE: player.showGridLines(); - player.hideStarryBackground(); + Tool.hideRoutes(curZone, setShowRoutes); player.activateMapMultiSelect((selectedSprites, restartFn) => { Tool.spriteListBeMovable(selectedSprites, () => { @@ -154,9 +154,6 @@ }) break case MAP_MODE.SETTINGS_MODE: - player.hideGridLines(); - // player.showStarryBackground(); // 0x2f68ac - player.activateMapMultiSelect((selectedSprites, restartFn) => { Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites); }); @@ -261,6 +258,14 @@ {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={rcsStatus ? 'inherit' : 'primary'} @@ -396,19 +401,31 @@ 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> + )} <Fab variant="extended" color="primary" - size="medium" + size="small" onClick={() => { player.adaptScreen(); }} > <FitScreen /> - {translate('page.map.action.adapt')} + {/* {translate('page.map.action.adapt')} */} </Fab> </Box> </Box> -- Gitblit v1.9.1