From dfc2d1e2bbbc01e68e0e7ee89f3a557db5841f93 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 19 十月 2024 13:29:40 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 59 +++++++++++++++++++++--------------------------------------
1 files changed, 21 insertions(+), 38 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index c4dbdd1..59298e7 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -5,19 +5,9 @@
MenuItem,
Button,
Box,
- SpeedDial,
- SpeedDialAction,
useTheme,
Fab,
} from '@mui/material';
-import {
- MoreVert as MoreVertIcon,
- Edit as EditIcon,
- FileCopy as FileCopyIcon,
- Save as SaveIcon,
- Print as PrintIcon,
- Share as ShareIcon,
-} from '@mui/icons-material';
import { MAP_MODE } from "./constants";
import Player from './player';
import * as Tool from './tool';
@@ -86,13 +76,14 @@
await Http.fetchMapData();
websocket.connect();
websocket.onMessage = (wsMsg) => {
- Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg));
+ Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
}
- setDataFetched(true);
- setMode(MAP_MODE.OBSERVER_MODE);
+
setTimeout(() => {
- player.adaptScreen();
notify.info(translate('page.map.welcome'));
+ player.adaptScreen();
+ setDataFetched(true);
+ setMode(MAP_MODE.OBSERVER_MODE);
}, 200)
}
initialize();
@@ -139,7 +130,7 @@
player.hideStarryBackground();
player.activateMapMultiSelect((selectedSprites, restartFn) => {
- setBatchSprites(selectedSprites);
+ Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites);
});
mapContainer.children.forEach(child => {
@@ -165,7 +156,7 @@
// player.showStarryBackground(); // 0x2f68ac
player.activateMapMultiSelect((selectedSprites, restartFn) => {
- setBatchSprites(selectedSprites);
+ Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites);
});
mapContainer.children.forEach(child => {
@@ -230,14 +221,6 @@
setBatchSelectionVisible(false)
}
}, [batchSprites])
-
- const actions = [
- { icon: <FileCopyIcon />, name: '澶嶅埗' },
- { icon: <SaveIcon />, name: '淇濆瓨' },
- { icon: <PrintIcon />, name: '鎵撳嵃' },
- { icon: <ShareIcon />, name: '鍒嗕韩' },
- { icon: <EditIcon />, name: '缂栬緫' },
- ];
return (
<Box
@@ -362,6 +345,20 @@
flexGrow: 1, // fill remaining of map space
position: 'relative',
backgroundColor: '#fff',
+ ...(mode === MAP_MODE.SETTINGS_MODE && {
+ animation: 'settingsPulse 1.5s infinite',
+ '@keyframes settingsPulse': {
+ '0%': {
+ boxShadow: `0 0 3px 1px ${theme.palette.primary.main.replace('rgb', 'rgba').replace(')', `, 0.1)`)}`,
+ },
+ '50%': {
+ boxShadow: `0 0 8px 3px ${theme.palette.primary.main.replace('rgb', 'rgba').replace(')', `, 0.5)`)}`,
+ },
+ '100%': {
+ boxShadow: `0 0 3px 1px ${theme.palette.primary.main.replace('rgb', 'rgba').replace(')', `, 0.1)`)}`,
+ },
+ },
+ })
}}
>
<Box
@@ -382,20 +379,6 @@
height: '100%',
}} />
</Box>
-
- {/* <SpeedDial
- ariaLabel="SpeedDial 绀轰緥"
- sx={{ position: 'absolute', bottom: 16, right: 16 }}
- icon={<MoreVertIcon />}
- >
- {actions.map((action) => (
- <SpeedDialAction
- key={action.name}
- icon={action.icon}
- tooltipTitle={action.name}
- />
- ))}
- </SpeedDial> */}
<Box
sx={{
--
Gitblit v1.9.1