From 5831c3e1dabd8d29270c140dc75151b20f65d030 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 08 四月 2025 10:52:32 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/map/MapPage.jsx |   69 ++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index c049c3d..8082926 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -8,7 +8,7 @@
     useTheme,
     Fab,
 } from '@mui/material';
-import { MAP_MODE } from "./constants";
+import { MAP_MODE, MAP_DEFAULT_ROTATION } from "./constants";
 import Player from './player';
 import * as Tool from './tool';
 import { NotificationProvider, useNotification } from './Notification';
@@ -19,10 +19,12 @@
 import * as Http from './http';
 import WebSocketClient from './websocket'
 import ConfirmButton from "../page/components/ConfirmButton";
-import { FitScreen, AltRoute } from '@mui/icons-material';
+import { FitScreen, RotateRight, Flip } from '@mui/icons-material';
 import MapSearch from "./header/MapSearch";
 import { startupOrShutdown } from "./http";
 import PulseSignal from "../page/components/PulseSignal";
+import FakeFab from "./header/FakeFab";
+import RouteFab from "./header/RouteFab";
 
 let player;
 let websocket;
@@ -39,7 +41,8 @@
     const [app, setApp] = useState(null);
     const [mapContainer, setMapContainer] = useState(null);
 
-    const [mode, setMode] = useState(null);
+    const [mode, setMode] = useState(MAP_MODE.OBSERVER_MODE);
+    const modeRef = useRef(mode);
     const [dataFetched, setDataFetched] = useState(false);
     const [insightVisible, setInsightVisible] = useState(false);
     const [deviceVisible, setDeviceVisible] = useState(false);
@@ -47,7 +50,6 @@
     const [batchSelectionVisible, setBatchSelectionVisible] = useState(false);
 
     const [curSprite, setCurSprite] = useState(null);
-    const prevCurSpriteRef = useRef();
     const [batchSprites, setBatchSprites] = useState([]);
 
     const [rcsStatus, setRcsStatus] = useState(null);
@@ -77,17 +79,19 @@
             Http.setMapContainer(player.mapContainer);
             websocket = new WebSocketClient('/ws/map/websocket');
 
-            await Http.fetchMapData(curZone, setRcsStatus);
+            await Http.fetchMapData(curZone, setRcsStatus, setCurSprite);
             websocket.connect();
             websocket.onMessage = (wsMsg) => {
-                Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
+                if (modeRef.current === MAP_MODE.OBSERVER_MODE) {
+                    Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
+                }
             }
 
+            player.rotateMap(localStorage.getItem('mapRotation') || Tool.rotationParseNum(MAP_DEFAULT_ROTATION));
             setTimeout(() => {
                 notify.info(translate('page.map.welcome'));
                 player.adaptScreen();
                 setDataFetched(true);
-                setMode(MAP_MODE.OBSERVER_MODE);
             }, 200)
         }
         initialize();
@@ -104,7 +108,6 @@
             player.destroy();
             window.removeEventListener('resize', handleResize);
             Tool.patchRaLayout('');
-            Tool.isF
         };
     }, [])
 
@@ -118,6 +121,8 @@
     }, [themeMode])
 
     const switchMode = (mode) => {
+        modeRef.current = mode;
+
         Tool.removeSelectedEffect();
         player.hideGridLines();
 
@@ -179,6 +184,9 @@
         sprite.x = mapX;
         sprite.y = mapY;
 
+        // sprite.scale.set(mapContainer.scale.x);
+        sprite.rotation = -mapContainer.rotation;
+
         Tool.initSprite(sprite, type);
         mapContainer.addChild(sprite);
         Tool.beMovable(sprite);
@@ -189,10 +197,7 @@
         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);
@@ -208,7 +213,6 @@
             setSettingsVisible(false);
         }
     }, [curSprite]);
-    const prevCurSprite = prevCurSpriteRef.current;
 
     // watch batchSprites
     React.useEffect(() => {
@@ -259,7 +263,12 @@
                 {mode === MAP_MODE.OBSERVER_MODE && (
                     <>
                         <Box sx={{ mr: 2, display: 'flex', alignItems: 'center' }}>
-                            <PulseSignal negative flag={rcsStatus} width={12} />
+                            <PulseSignal
+                                negative
+                                negativeColor='#a4b0be'
+                                flag={rcsStatus}
+                                width={12}
+                            />
                         </Box>
                         <Button
                             variant="contained"
@@ -400,17 +409,27 @@
                     }}
                 >
                     {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>
+                        <>
+                            <RouteFab
+                                curZone={curZone}
+                                showRoutes={showRoutes}
+                                setShowRoutes={setShowRoutes}
+                                notify={notify}
+                            />
+                            <FakeFab />
+                        </>
                     )}
+                    <Fab
+                        variant="extended"
+                        color="primary"
+                        size="small"
+                        onClick={() => {
+                            player.rotateMap(Math.PI / 2);
+                        }}
+                    >
+                        <RotateRight />
+                        &nbsp;{translate('page.map.action.rotate')}&nbsp;
+                    </Fab>
                     <Fab
                         variant="extended"
                         color="primary"
@@ -420,7 +439,7 @@
                         }}
                     >
                         <FitScreen />
-                        {/* &nbsp;{translate('page.map.action.adapt')} */}
+                        &nbsp;{translate('page.map.action.adapt')}&nbsp;
                     </Fab>
                 </Box>
             </Box>

--
Gitblit v1.9.1