#

luxiaotao1123

2024-03-08 280e039a5ba85fd077acac488efe3ed08ce85f94

 zy-asrs-flow/src/pages/map/index.jsx

@@ -70,7 +70,8 @@
    const [app, setApp] = React.useState(null);
    const [mapContainer, setMapContainer] = React.useState(null);
    const [didClickSprite, setDidClickSprite] = React.useState(false);
    const [currSpriteBySettings, setCurrSpriteBySettings] = React.useState(null);
    const [spriteBySettings, setSpriteBySettings] = React.useState(null);
    const prevSpriteBySettingsRef = React.useRef();

    // init func
    React.useEffect(() => {
@@ -112,6 +113,10 @@

                player.activateMapEvent(null);

                Utils.removeSelectedEffect();
                setDeviceVisible(false);
                setSettingsVisible(false);

                mapContainer.children.forEach(child => {
                    child.off('pointerup');
                    child.off('pointermove');
@@ -126,6 +131,10 @@

                player.activateMapEvent(Utils.MapEvent.SELECTION_BOX);

                Utils.removeSelectedEffect();
                setSpriteBySettings(null);
                setSettingsVisible(false);

                mapContainer.children.forEach(child => {
                    Utils.beMovable(child, setDidClickSprite);
                })
@@ -137,8 +146,10 @@

                player.activateMapEvent(null);

                setDeviceVisible(false);

                mapContainer.children.forEach(child => {
                    Utils.beSettings(child, setCurrSpriteBySettings, setDidClickSprite);
                    Utils.beSettings(child, setSpriteBySettings, setDidClickSprite);
                })
                break
            default:
@@ -147,12 +158,12 @@
    }, [model]);

    // Add New Device
    const onDrop = (sprite, x, y) => {
    const onDrop = (sprite, type, x, y) => {
        const { mapX, mapY } = Utils.getRealPosition(x, y, mapContainer);
        sprite.x = mapX;
        sprite.y = mapY;

        Utils.initSprite(sprite);
        Utils.initSprite(sprite, type);
        mapContainer.addChild(sprite);
        Utils.beMovable(sprite, setDidClickSprite);
    };
@@ -162,20 +173,29 @@
        player.updateDidClickSprite(didClickSprite);
    }, [didClickSprite])

    // watch spriteBySettings
    React.useEffect(() => {
        if (!mapContainer) {
            return;
        }
        console.log(currSpriteBySettings);
        if (currSpriteBySettings) {
            setSettingsVisible(true);
        prevSpriteBySettingsRef.current = spriteBySettings;
        if (spriteBySettings && prevSpriteBySettings !== spriteBySettings) {
            Utils.removeSelectedEffect();
        }
    }, [currSpriteBySettings])
        if (spriteBySettings) {
            Utils.showSelectedEffect(spriteBySettings)
            setSettingsVisible(true);
        } else {
            Utils.removeSelectedEffect();
        }
    }, [spriteBySettings])
    const prevSpriteBySettings = prevSpriteBySettingsRef.current;

    const settingsFinish = () => {
        setCurrSpriteBySettings(null);
        setSettingsVisible(false);
        setSpriteBySettings(null);
    }
    

    return (
        <>
            <Layout className={styles.layout}>
@@ -208,46 +228,53 @@
                    </Row>
                </Header>
                <Content ref={contentRef} className={styles.content}>
                    <div ref={mapRef} style={{ position: "relative" }} />

                    <FloatButton.Group
                        shape="square"
                        style={{
                            left: 35,
                            bottom: 35
                        }}
                    >
                        <FloatButton
                            icon={<CompressOutlined />}
                        />
                        <FloatButton.BackTop visibilityHeight={0} />
                    </FloatButton.Group>

                    <FloatButton.Group
                        hidden={model === MapModel.OBSERVER_MODEL}
                        trigger="hover"
                        style={{
                            right: 35,
                            bottom: 35
                        }}
                        icon={<AppstoreAddOutlined />}
                    >
                        <FloatButton
                            tooltip={<div><FormattedMessage id='map.device.add' defaultMessage='添加设备' /></div>}
                            icon={<FileAddOutlined />}
                            onClick={() => {
                                setDeviceVisible(true);
                    <div ref={mapRef} style={{ position: "relative" }} >
                        <FloatButton.Group
                            shape="square"
                            style={{
                                left: 35,
                                bottom: 35
                            }}
                        />
                        <FloatButton
                            type={model === MapModel.SETTINGS_MODEL ? 'primary' : 'default'}
                            tooltip={<div><FormattedMessage id='map.device.oper' defaultMessage='参数设置' /></div>}
                            icon={<SettingOutlined />}
                            onClick={() => {
                                setModel(model === MapModel.SETTINGS_MODEL ? MapModel.MOVABLE_MODEL : MapModel.SETTINGS_MODEL)
                        >
                            <FloatButton
                                icon={<CompressOutlined />}
                            />
                            <FloatButton.BackTop visibilityHeight={0} />
                        </FloatButton.Group>

                        <FloatButton.Group
                            hidden={model === MapModel.OBSERVER_MODEL}
                            style={{
                                left: 35,
                                bottom: window.innerHeight / 2
                            }}
                        />
                    </FloatButton.Group>
                            icon={<AppstoreAddOutlined />}
                        >
                            <FloatButton
                                hidden={model === MapModel.OBSERVER_MODEL}
                                type={deviceVisible ? 'primary' : 'default'}
                                tooltip={<div><FormattedMessage id='map.device.add' defaultMessage='添加设备' /></div>}
                                icon={<FileAddOutlined />}
                                onClick={() => {
                                    if (deviceVisible) {
                                        setDeviceVisible(false);
                                    } else {
                                        setDeviceVisible(true);
                                        setModel(MapModel.MOVABLE_MODEL);
                                    }
                                }}
                            />
                            <FloatButton
                                hidden={model === MapModel.OBSERVER_MODEL}
                                type={model === MapModel.SETTINGS_MODEL ? 'primary' : 'default'}
                                tooltip={<div><FormattedMessage id='map.device.oper' defaultMessage='参数设置' /></div>}
                                icon={<SettingOutlined />}
                                onClick={() => {
                                    setModel(model === MapModel.SETTINGS_MODEL ? MapModel.MOVABLE_MODEL : MapModel.SETTINGS_MODEL)
                                }}
                            />
                        </FloatButton.Group>
                    </div>
                </Content>
            </Layout>

@@ -262,11 +289,13 @@

            <Settings
                open={settingsVisible}
                curSprite={spriteBySettings}
                onCancel={() => {
                    setSettingsVisible(false);
                    setSpriteBySettings(null);
                }}
                refCurr={mapRef.current}
                onDrop={settingsFinish}
                onSubmit={settingsFinish}
            />
        </>
    )