From eaa43a7ce551a02d06c1c77461008759034d0658 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 10 十月 2024 10:58:48 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 69c9801..a2335b3 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -28,10 +28,10 @@
let player;
const Map = () => {
- const theme = useTheme();
- const themeMode = theme.palette.mode;
const notify = useNotification();
const translate = useTranslate();
+ const theme = useTheme();
+ const themeMode = theme.palette.mode;
const mapRef = useRef();
const contentRef = useRef();
@@ -39,8 +39,11 @@
const [mapContainer, setMapContainer] = useState(null);
const [mode, setMode] = useState(MapMode.OBSERVER_MODE);
- const [deviceVisible, setDeviceVisible] = React.useState(false);
+ const [deviceVisible, setDeviceVisible] = useState(false);
+ const [settingsVisible, setSettingsVisible] = useState(false);
+ const [spriteSettings, setSpriteSettings] = useState(null);
+ const prevSpriteSettingsRef = React.useRef();
useEffect(() => {
Tool.patchRaLayout('0px');
@@ -50,6 +53,7 @@
setMapContainer(player.mapContainer);
Tool.setApp(player.app);
Tool.setMapContainer(player.mapContainer);
+ Tool.setThemeMode(themeMode);
Http.setNotify(notify);
await Http.fetchMapData(0);
@@ -63,10 +67,6 @@
const height = contentRef.current.offsetHeight;
player.resize(width, height);
- if (mode === MapMode.MOVABLE_MODE) {
- console.log('aa');
- player.showGridLines();
- }
};
handleResize();
window.addEventListener('resize', handleResize);
@@ -107,6 +107,10 @@
player.activateMapMultiSelect((selectedSprites, restartFn) => {
console.log(selectedSprites);
});
+
+ mapContainer.children.forEach(child => {
+ Tool.beSettings(child, setSpriteSettings);
+ })
break
default:
break
@@ -118,11 +122,9 @@
return
}
switchMode(mode);
- }, [mode]);
+ }, [mode, mapContainer]);
const onDrop = (sprite, type, x, y) => {
- console.log(sprite, type, x, y);
-
const { mapX, mapY } = Tool.getRealPosition(x, y);
sprite.x = mapX;
sprite.y = mapY;
@@ -132,6 +134,26 @@
Tool.beMovable(sprite);
};
+ // watch spriteSettings
+ useEffect(() => {
+ if (!mapContainer) {
+ return;
+ }
+ console.log(spriteSettings);
+
+ prevSpriteSettingsRef.current = spriteSettings;
+ if (spriteSettings && prevSpriteSettings !== spriteSettings) {
+ Tool.removeSelectedEffect();
+ }
+ if (spriteSettings) {
+ Tool.showSelectedEffect(spriteSettings)
+ setSettingsVisible(true);
+ } else {
+ Tool.removeSelectedEffect();
+ }
+ }, [spriteSettings, mapContainer])
+ const prevSpriteSettings = prevSpriteSettingsRef.current;
+
const actions = [
{ icon: <FileCopyIcon />, name: '澶嶅埗' },
{ icon: <SaveIcon />, name: '淇濆瓨' },
--
Gitblit v1.9.1