From 06b0d3f8668a69585273c2f000d61ac318d7e161 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 07 十二月 2024 09:19:47 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/map/MapPage.jsx |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index adfba19..b777f45 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';
@@ -40,7 +40,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);
@@ -48,7 +49,6 @@
     const [batchSelectionVisible, setBatchSelectionVisible] = useState(false);
 
     const [curSprite, setCurSprite] = useState(null);
-    const prevCurSpriteRef = useRef();
     const [batchSprites, setBatchSprites] = useState([]);
 
     const [rcsStatus, setRcsStatus] = useState(null);
@@ -78,18 +78,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'));
+            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();
@@ -106,7 +107,6 @@
             player.destroy();
             window.removeEventListener('resize', handleResize);
             Tool.patchRaLayout('');
-            Tool.isF
         };
     }, [])
 
@@ -120,6 +120,8 @@
     }, [themeMode])
 
     const switchMode = (mode) => {
+        modeRef.current = mode;
+
         Tool.removeSelectedEffect();
         player.hideGridLines();
 
@@ -181,6 +183,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);
@@ -191,10 +196,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);
@@ -210,7 +212,6 @@
             setSettingsVisible(false);
         }
     }, [curSprite]);
-    const prevCurSprite = prevCurSpriteRef.current;
 
     // watch batchSprites
     React.useEffect(() => {
@@ -417,9 +418,9 @@
                                 }}
                             >
                                 <AltRoute />
+                                &nbsp;{translate('page.map.action.route')}&nbsp;
                             </Fab>
-                            <FakeFab
-                            />
+                            <FakeFab />
                         </>
                     )}
                     <Fab
@@ -431,7 +432,7 @@
                         }}
                     >
                         <RotateRight />
-                        {/* &nbsp;{translate('page.map.action.adapt')} */}
+                        &nbsp;{translate('page.map.action.rotate')}&nbsp;
                     </Fab>
                     <Fab
                         variant="extended"
@@ -442,7 +443,7 @@
                         }}
                     >
                         <FitScreen />
-                        {/* &nbsp;{translate('page.map.action.adapt')} */}
+                        &nbsp;{translate('page.map.action.adapt')}&nbsp;
                     </Fab>
                 </Box>
             </Box>

--
Gitblit v1.9.1