From 8e058ad522772460a6964a4ba49002363e1e4d1a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 08 十一月 2024 13:23:23 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/map/MapPage.jsx |   51 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 1564c27..e1e916c 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, RotateRight } 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;
@@ -81,6 +83,7 @@
                 Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
             }
 
+            player.rotateMap(localStorage.getItem('mapRotation'));
             setTimeout(() => {
                 notify.info(translate('page.map.welcome'));
                 player.adaptScreen();
@@ -117,6 +120,7 @@
 
     const switchMode = (mode) => {
         Tool.removeSelectedEffect();
+        player.hideGridLines();
 
         setInsightVisible(false);
         setDeviceVisible(false);
@@ -128,9 +132,6 @@
 
         switch (mode) {
             case MAP_MODE.OBSERVER_MODE:
-                player.hideGridLines();
-                player.hideStarryBackground();
-
                 player.activateMapMultiSelect((selectedSprites, restartFn) => {
                     Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites);
                 });
@@ -141,7 +142,7 @@
                 break
             case MAP_MODE.MOVABLE_MODE:
                 player.showGridLines();
-                player.hideStarryBackground();
+                Tool.hideRoutes(curZone, setShowRoutes);
 
                 player.activateMapMultiSelect((selectedSprites, restartFn) => {
                     Tool.spriteListBeMovable(selectedSprites, () => {
@@ -154,9 +155,6 @@
                 })
                 break
             case MAP_MODE.SETTINGS_MODE:
-                player.hideGridLines();
-                // player.showStarryBackground(); // 0x2f68ac
-
                 player.activateMapMultiSelect((selectedSprites, restartFn) => {
                     Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites);
                 });
@@ -261,6 +259,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 +402,42 @@
                         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.rotateMap(Math.PI / 2);
+                        }}
+                    >
+                        <RotateRight />
+                        {/* &nbsp;{translate('page.map.action.adapt')} */}
+                    </Fab>
+                    <Fab
+                        variant="extended"
+                        color="primary"
+                        size="small"
                         onClick={() => {
                             player.adaptScreen();
                         }}
                     >
                         <FitScreen />
-                        &nbsp;{translate('page.map.action.adapt')}
+                        {/* &nbsp;{translate('page.map.action.adapt')} */}
                     </Fab>
                 </Box>
             </Box>

--
Gitblit v1.9.1