From 1e465fcab874dd5bf60fdff4151a3742b5a755b0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 17 十月 2024 14:21:12 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/tool.js | 140 +++++++++++++++++++++++++++++++---------------
1 files changed, 94 insertions(+), 46 deletions(-)
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index fb8c7f7..8ef7d0b 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -101,7 +101,7 @@
default:
break;
}
- if (sprite) {
+ if (sprite && deviceType !== DEVICE_TYPE.AGV) {
sprite.blendMode = PIXI.BLEND_MODES.MULTIPLY;
}
return sprite;
@@ -129,49 +129,16 @@
}
}
+export const findSpriteByUuid = (uuid) => {
+ return mapContainer?.children?.find(child => child?.data?.uuid === uuid);
+}
+
export const markSprite = (sprite) => {
sprite.alpha = 0.5;
}
export const unMarkSprite = (sprite) => {
sprite.alpha = 1;
-}
-
-export const beMovable = (sprite) => {
- sprite.off('pointerup');
- sprite.off('pointermove');
- sprite.off('pointerdown');
- sprite.off('click');
-
- sprite.on("pointerdown", onDragStart);
-
- let dragTarget;
- function onDragStart(event) {
- if (event.button === 0) {
- dragTarget = event.currentTarget;
- mapContainer.parent.off('pointermove');
- mapContainer.parent.on('pointermove', onDragMove, dragTarget);
-
- mapContainer.parent.off('pointerup');
- mapContainer.parent.on('pointerup', onDragEnd.bind(mapContainer));
- }
- }
-
- function onDragMove(event) {
- if (this) {
- this.parent.toLocal(event.global, null, this.position);
- }
- }
-
- function onDragEnd() {
- if (dragTarget) {
- this.parent.off('pointermove');
- this.parent.off('pointerup');
- dragTarget.alpha = 1;
- dragTarget = null;
- }
- }
-
}
export const spriteListBeMovable = (selectedSprites, endFn) => {
@@ -250,6 +217,57 @@
&& spriteBounds.y < boxBounds.y + boxBounds.height;
}
+export const beInsight = (sprite, setCurSprite) => {
+ sprite.off('pointerup');
+ sprite.off('pointermove');
+ sprite.off('pointerdown');
+ sprite.off('click');
+
+ sprite.on("click", onClick);
+
+ function onClick(event) {
+ setCurSprite(sprite);
+ }
+
+}
+
+export const beMovable = (sprite) => {
+ sprite.off('pointerup');
+ sprite.off('pointermove');
+ sprite.off('pointerdown');
+ sprite.off('click');
+
+ sprite.on("pointerdown", onDragStart);
+
+ let dragTarget;
+ function onDragStart(event) {
+ if (event.button === 0) {
+ dragTarget = event.currentTarget;
+ mapContainer.parent.off('pointermove');
+ mapContainer.parent.on('pointermove', onDragMove, dragTarget);
+
+ mapContainer.parent.off('pointerup');
+ mapContainer.parent.on('pointerup', onDragEnd.bind(mapContainer));
+ }
+ }
+
+ function onDragMove(event) {
+ if (this) {
+ this.parent.toLocal(event.global, null, this.position);
+ }
+ }
+
+ function onDragEnd() {
+ if (dragTarget) {
+ this.parent.off('pointermove');
+ this.parent.off('pointerup');
+ dragTarget.alpha = 1;
+ dragTarget = null;
+ }
+ }
+
+}
+
export const beSettings = (sprite, setSpriteSettings) => {
sprite.off('pointerup');
sprite.off('pointermove');
@@ -261,6 +279,33 @@
function onClick(event) {
setSpriteSettings(sprite);
}
+}
+
+export const focusSprite = (sprite) => {
+ if (!sprite || !app || !mapContainer) {
+ return;
+ }
+
+ mapContainer.scale.set(0.3);
+ mapContainer.position.set(0, 0);
+
+ let bounds = sprite.getBounds();
+ let focusPoint = {
+ x: bounds.x + bounds.width / 2,
+ y: bounds.y + bounds.height / 2
+ };
+
+ let targetPos = {
+ x: app.renderer.width / 4 - focusPoint.x,
+ y: app.renderer.height / 2 - focusPoint.y
+ };
+
+ new TWEEDLE.Tween(mapContainer.position)
+ .easing(TWEEDLE.Easing.Quadratic.Out)
+ .to(targetPos, 500)
+ .onComplete(() => {
+ })
+ .start();
}
export const clearMapData = () => {
@@ -451,28 +496,31 @@
// dynamic graphic ----------------
-export const generateDynamicGraphic = (curZone, data) => {
- console.log("ws", curZone, data);
+export const generateDynamicGraphic = (curZone, data, setCurSprite) => {
+ // console.log("ws", curZone, data);
- for (const agvVo of data.agvVos) {
- showAgvSprite(curZone, agvVo)
+ for (const agv of data.agvVos) {
+ showAgvSprite(curZone, agv, setCurSprite)
}
}
-const showAgvSprite = (curZone, agvVo) => {
- const { agvNo, code, direction, backpack, battery, ...rest } = agvVo;
+const showAgvSprite = (curZone, agv, setCurSprite) => {
+ const { agvNo, code, direction, backpack, battery, ...rest } = agv;
if (!code) { return }
const codeSprite = querySprite(DEVICE_TYPE.POINT, code);
if (!codeSprite) { return }
let agvSprite = querySprite(DEVICE_TYPE.AGV, agvNo);
if (!agvSprite) {
- agvSprite = generateSprite(DEVICE_TYPE.AGV, generateAgvSpriteTexture(getAgvStatusMode(backpack, battery)));
+ agvSprite = generateSprite(DEVICE_TYPE.AGV,
+ generateAgvSpriteTexture(getAgvStatusMode(backpack.filter(item => item.loaded === true).length, battery))
+ );
initSprite(agvSprite, DEVICE_TYPE.AGV);
agvSprite.data.no = agvNo;
agvSprite.position.set(codeSprite.position.x, codeSprite.position.y);
agvSprite.rotation = rotationParseNum(direction);
mapContainer.addChild(agvSprite);
- // viewFeature(shuttle, setCurSPrite); // todo
+ beInsight(agvSprite, setCurSprite);
+ // agv no on sprite
}
}
\ No newline at end of file
--
Gitblit v1.9.1