From a97a7a41646937d098317f7d53ec643b45de0f14 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 09 十月 2024 16:25:46 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 149 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 120 insertions(+), 29 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 4277552..c67fcf4 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -1,4 +1,5 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
+import { useTranslate } from "react-admin";
import {
TextField,
Select,
@@ -21,20 +22,24 @@
import Player from './player';
import * as Tool from './tool';
import { NotificationProvider, useNotification } from './Notification';
+import Device from "./Device";
let player;
const Map = () => {
- const mapRef = useRef();
- const contentRef = React.useRef();
- const [app, setApp] = useState(null);
- const [mapContainer, setMapContainer] = React.useState(null);
- const notify = useNotification();
-
- const [mode, setMode] = useState(MapModel.OBSERVER_MODEL);
-
const theme = useTheme();
const themeMode = theme.palette.mode;
+ const notify = useNotification();
+ const translate = useTranslate();
+
+ const mapRef = useRef();
+ const contentRef = useRef();
+ const [app, setApp] = useState(null);
+ const [mapContainer, setMapContainer] = useState(null);
+
+ const [mode, setMode] = useState(MapMode.OBSERVER_MODE);
+ const [deviceVisible, setDeviceVisible] = React.useState(false);
+
useEffect(() => {
Tool.patchRaLayout('0px');
@@ -67,9 +72,56 @@
};
}, [themeMode])
+ const switchMode = (mode) => {
+ switch (mode) {
+ case MapMode.OBSERVER_MODE:
+ setDeviceVisible(false);
+ player.hideGridLines();
- const handleModeChange = (event) => {
- setMode(event.target.value);
+ player.activateMapMultiSelect((selectedSprites, restartFn) => {
+ console.log(selectedSprites);
+ });
+
+ break
+ case MapMode.MOVABLE_MODE:
+ player.showGridLines();
+
+ player.activateMapMultiSelect((selectedSprites, restartFn) => {
+ Tool.spriteListBeMovable(selectedSprites, () => {
+ restartFn();
+ });
+ });
+ break
+ case MapMode.SETTINGS_MODE:
+ player.hideGridLines();
+ setDeviceVisible(false);
+
+ player.activateMapMultiSelect((selectedSprites, restartFn) => {
+ console.log(selectedSprites);
+ });
+ break
+ default:
+ break
+ }
+ }
+
+ useEffect(() => {
+ if (!mapContainer) {
+ return
+ }
+ switchMode(mode);
+ }, [mode]);
+
+ 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;
+
+ Tool.initSprite(sprite, type);
+ mapContainer.addChild(sprite);
+ Tool.beMovable(sprite);
};
const actions = [
@@ -88,6 +140,7 @@
flexDirection: 'column',
}}
>
+ {/* header */}
<Box
sx={{
display: 'flex',
@@ -97,6 +150,7 @@
padding: '0 16px',
height: '64px',
flexShrink: 0, // keep height
+ zIndex: 200
}}
>
<TextField
@@ -110,32 +164,59 @@
}}
/>
<Box sx={{ flexGrow: 1 }} />
+
+ {mode === MapMode.OBSERVER_MODE && (
+ <>
+ <Button
+ variant="contained"
+ color="primary"
+ sx={{ mr: 1 }}
+ >
+ 鍋滄RCS杩愯浆
+ </Button>
+ <Button variant="contained" color="secondary">
+ 妯℃嫙AGV杩愯
+ </Button>
+ </>
+ )}
+
+ {mode === MapMode.MOVABLE_MODE && (
+ <>
+ <Button
+ variant="contained"
+ color="primary"
+ sx={{ mr: 1 }}
+ onClick={() => setDeviceVisible(!deviceVisible)}
+ >
+ {translate('page.map.devices.title')}
+ </Button>
+ </>
+ )}
+
+ {mode === MapMode.SETTINGS_MODE && (
+ <>
+ </>
+ )}
+
<Select
value={mode}
- onChange={handleModeChange}
+ onChange={(event) => {
+ setMode(event.target.value);
+ }}
variant="outlined"
size="small"
sx={{
- mr: 2,
+ ml: 2,
backgroundColor: '#fff',
borderRadius: 1,
}}
>
- <MenuItem value={MapModel.OBSERVER_MODEL}>鐩戞帶妯″紡</MenuItem>
- <MenuItem value={MapModel.MOVABLE_MODEL}>缂栬緫妯″紡</MenuItem>
- <MenuItem value={MapModel.SETTINGS_MODEL}>閰嶇疆妯″紡</MenuItem>
+ <MenuItem value={MapMode.OBSERVER_MODE}>鐩戞帶妯″紡</MenuItem>
+ <MenuItem value={MapMode.MOVABLE_MODE}>缂栬緫妯″紡</MenuItem>
+ <MenuItem value={MapMode.SETTINGS_MODE}>閰嶇疆妯″紡</MenuItem>
</Select>
- <Button
- variant="contained"
- color="primary"
- sx={{ mr: 1 }}
- >
- 鍋滄RCS杩愯浆
- </Button>
- <Button variant="contained" color="secondary">
- 妯℃嫙AGV杩愯
- </Button>
</Box>
+ {/* content */}
<Box
sx={{
flexGrow: 1, // fill remaining of map space
@@ -176,6 +257,16 @@
))}
</SpeedDial>
</Box>
+
+ <Device
+ open={deviceVisible}
+ onCancel={() => {
+ setDeviceVisible(false);
+ }}
+ onDrop={onDrop}
+ width={378}
+ />
+
</Box>
);
}
@@ -188,10 +279,10 @@
)
}
-export const MapModel = Object.freeze({
- OBSERVER_MODEL: "1",
- MOVABLE_MODEL: "2",
- SETTINGS_MODEL: "3",
+export const MapMode = Object.freeze({
+ OBSERVER_MODE: "1",
+ MOVABLE_MODE: "2",
+ SETTINGS_MODE: "3",
})
export default MapPage;
--
Gitblit v1.9.1