Merge branch 'rcs_master' into jdxaj

zhang

4 天以前 82416a8117dd69be757380e8a42ecbac6e861e11

 zy-acs-flow/src/map/MapPage.jsx

@@ -8,7 +8,7 @@
    useTheme,
    Fab,
} from '@mui/material';
import { MAP_MODE, MAP_DEFAULT_ROTATION } from "./constants";
import { MAP_MODE, MAP_DEFAULT_ROTATION, setMapPreferences } from "./constants";
import Player from './player';
import * as Tool from './tool';
import { NotificationProvider, useNotification } from './Notification';
@@ -29,6 +29,7 @@
import RouteFab from "./header/RouteFab";
import AreaFab from "./header/AreaFab";
import MoreOperate from "./header/MoreOperate";
import NewsLogDialog from "./NewsLogDialog";

let player;
let websocket;
@@ -66,9 +67,12 @@
        const storedValue = localStorage.getItem('curZone');
        return storedValue !== null ? JSON.parse(storedValue) : null;
    });
    const [logDialogOpen, setLogDialogOpen] = useState(false);

    const handleResize = () => {
        if (!contentRef) { return; }
        if (!contentRef.current || !player) {
            return;
        }
        const width = contentRef.current.offsetWidth;
        const height = contentRef.current.offsetHeight;
        player.resize(width, height);
@@ -85,6 +89,7 @@
            Tool.setThemeMode(themeMode);
            Http.setNotify(notify);
            Http.setMapContainer(player.mapContainer);
            await Http.fetchMapPreferences(curZone, setMapPreferences);
            websocket = new WebSocketClient('/ws/map/websocket');

            await Http.fetchMapData(curZone, setRcsStatus, setCurSprite);
@@ -124,6 +129,9 @@
    }, [sidebarOpen]);

    useEffect(() => {
        if (!player) {
            return;
        }
        player.setTheme(themeMode);
        Tool.setThemeMode(themeMode);
    }, [themeMode])
@@ -218,6 +226,7 @@
        if (!mapContainer) {
            return;
        }
        setAreaListVisible(false);
        Tool.removeSelectedEffect();
        if (curSprite) {
            if (mode === MAP_MODE.OBSERVER_MODE) {
@@ -308,7 +317,11 @@
                        >
                            {rcsStatus ? translate('page.map.action.shutdown') : translate('page.map.action.startup')}
                        </Button>
                        <Button variant="contained" color="primary">
                        <Button
                            variant="contained"
                            color="primary"
                            onClick={() => setLogDialogOpen(true)}
                        >
                            {translate('page.map.action.monitor')}
                        </Button>
                        <MoreOperate />
@@ -375,11 +388,14 @@
                            {translate('page.map.action.areaList')}
                        </Button>
                        <Button
                            variant={areaDrawing ? "outlined" : "contained"}
                            color="primary"
                            sx={{}}
                            disabled={areaDrawing}
                            variant="contained"
                            color={areaDrawing ? "error" : "primary"}
                            onClick={() => {
                                if (areaDrawing) {
                                    Tool.cancelAreaDrawing();
                                    setAreaDrawing(false);
                                    return;
                                }
                                setCurSprite(null);
                                const started = Tool.startAreaDrawing({
                                    promptText: translate('page.map.area.prompt.nameInput'),
@@ -402,7 +418,9 @@
                                }
                            }}
                        >
                            {translate('page.map.action.addArea')}
                            {areaDrawing
                                ? translate('page.map.action.cancelAddArea')
                                : translate('page.map.action.addArea')}
                        </Button>
                    </>
                )}
@@ -576,9 +594,14 @@
                zoneId={curZone}
                open={areaListVisible}
                onClose={() => setAreaListVisible(false)}
                width={400}
                setCurSprite={setCurSprite}
                width={378}
            />

            <NewsLogDialog
                open={logDialogOpen}
                onClose={() => setLogDialogOpen(false)}
            />
        </Box>
    );
}