From ab886689e2c4ef8db2b0767717d69ebbaf10326c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 29 十一月 2024 16:37:20 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/tool.js | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 08939c6..d50ab3d 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -9,6 +9,7 @@
DEVICE_SELECTED_EFFECT_COLOR,
POINT_ROUTE_DIRECTION,
DEVICE_SPRITE_TINT_DARK,
+ ANIMATE_DURING_TIME,
} from './constants';
import { getRouteList } from './http';
import PointRoute from "./PointRoute";
@@ -71,11 +72,10 @@
export const getRealPosition = (x, y) => {
- const rect = app.view.getBoundingClientRect();
- return {
- mapX: (x - rect.left) / mapContainer.scale.x - mapContainer.x / mapContainer.scale.x,
- mapY: (y - rect.top) / mapContainer.scale.y - mapContainer.y / mapContainer.scale.y
- }
+ const globalPoint = new PIXI.Point();
+ app.renderer.plugins.interaction.mapPositionToPoint(globalPoint, x, y);
+ const mapPoint = mapContainer.toLocal(globalPoint);
+ return { mapX: mapPoint.x, mapY: mapPoint.y };
}
export const generateSprite = (deviceType, texture) => {
@@ -111,8 +111,8 @@
if (texture) {
sprite = new PIXI.Sprite(PIXI.Texture.from(texture, { resourceOptions: { scale: 1 } }));
}
- sprite.width = 800;
- sprite.height = 1500;
+ sprite.width = 750;
+ sprite.height = 1300;
sprite.zIndex = DEVICE_Z_INDEX.AGV;
break
case DEVICE_TYPE.POINT:
@@ -564,7 +564,7 @@
const endRotation = sprite.rotation + rotationDifference;
new TWEEDLE.Tween(sprite)
- .to({ rotation: endRotation }, 1000)
+ .to({ rotation: endRotation }, ANIMATE_DURING_TIME)
.easing(TWEEDLE.Easing.Linear.None)
.onUpdate(() => {
// agv
@@ -656,11 +656,11 @@
}
}
-const agvRotationOffsetDegrees = 0;
+const agvRotationOffsetDegrees = 90;
const agvRotationOffset = rotationParseNum(agvRotationOffsetDegrees);
const showAgvSprite = (curZone, agvVo, setCurSprite) => {
- const { agvNo, code, direction, battery, backpack } = agvVo;
+ const { agvNo, code, direction, battery, backpack, error } = agvVo;
if (!code) { return; }
const codeSprite = querySprite(DEVICE_TYPE.POINT, code);
if (!codeSprite) { return; }
@@ -683,7 +683,6 @@
agvSprite.position.set(codeSprite.position.x, codeSprite.position.y);
agvSprite.rotation = targetRotation + agvRotationOffset;
mapContainer.addChild(agvSprite);
- beInsight(agvSprite, setCurSprite);
// agvNo sprite
const agvText = new PIXI.Text(agvNo.toString(), {
@@ -714,14 +713,22 @@
agvSprite.data.battery = battery;
}
- animateRotation(agvSprite, targetRotation, agvRotationOffset);
+ animateRotation(agvSprite, targetRotation + agvRotationOffset, agvRotationOffset);
}
+
+ if (error) {
+ agvSprite.tint = 0xff3f34;
+ } else {
+ agvSprite.tint = 0xffffff;
+ }
+
+ beInsight(agvSprite, setCurSprite);
new TWEEDLE.Tween(agvSprite.position)
.to({
x: codeSprite.position.x,
y: codeSprite.position.y
- }, 1000)
+ }, ANIMATE_DURING_TIME)
.easing(TWEEDLE.Easing.Linear.None)
.start();
}
@@ -739,7 +746,7 @@
}
agvPath = new PIXI.Graphics();
agvPath.name = agvPathName;
- agvPath.lineStyle(Math.max(20, 4 * (1 / mapContainer.scale.x)), 0x2f68ac, 0.8);
+ agvPath.lineStyle(Math.max(20, 4 * (1 / mapContainer?.scale.x || 1)), 0x2f68ac, 0.8);
agvPath.zIndex = DEVICE_Z_INDEX.DYNAMIC_ROUTE;
// agvPath.blendMode = PIXI.BLEND_MODES.NORMAL;
--
Gitblit v1.9.1