From f02bcf6f8de66d54fc4d9b10d62f82f3c7aa3574 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 02 十二月 2024 15:18:40 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index ba9ebb1..e19fb86 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';
@@ -41,6 +41,7 @@
const [mapContainer, setMapContainer] = 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);
@@ -80,10 +81,12 @@
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();
@@ -104,7 +107,6 @@
player.destroy();
window.removeEventListener('resize', handleResize);
Tool.patchRaLayout('');
- Tool.isF
};
}, [])
@@ -118,6 +120,8 @@
}, [themeMode])
const switchMode = (mode) => {
+ modeRef.current = mode;
+
Tool.removeSelectedEffect();
player.hideGridLines();
@@ -178,6 +182,9 @@
const { mapX, mapY } = Tool.getRealPosition(x, y);
sprite.x = mapX;
sprite.y = mapY;
+
+ // sprite.scale.set(mapContainer.scale.x);
+ sprite.rotation = -mapContainer.rotation;
Tool.initSprite(sprite, type);
mapContainer.addChild(sprite);
@@ -412,8 +419,7 @@
>
<AltRoute />
</Fab>
- <FakeFab
- />
+ <FakeFab />
</>
)}
<Fab
--
Gitblit v1.9.1