From c58587c4965333eeafd7d1c00ad98bd13f6420b4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 03 十二月 2024 08:11:22 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/tool.js | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index d50ab3d..09d3ded 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -1,14 +1,15 @@
import * as PIXI from 'pixi.js';
import * as TWEEDLE from 'tweedle.js';
import {
+ MAP_DEFAULT_ROTATION,
DEVICE_TYPE,
DEVICE_Z_INDEX,
AGV_STATUS_MODE,
DEVICE_SPRITE_TINT,
+ DEVICE_SPRITE_TINT_DARK,
DEVICE_SELECTED_EFFECT_PADDING,
DEVICE_SELECTED_EFFECT_COLOR,
POINT_ROUTE_DIRECTION,
- DEVICE_SPRITE_TINT_DARK,
ANIMATE_DURING_TIME,
} from './constants';
import { getRouteList } from './http';
@@ -54,19 +55,16 @@
export function setThemeMode(param) {
themeMode = param;
if (mapContainer) {
- // mapContainer.children.forEach(child => {
- // const deviceType = child.data?.type;
- // if (deviceType) {
- // if (themeMode === 'dark') {
- // const tint = DEVICE_SPRITE_TINT_DARK[deviceType]
- // if (tint) {
- // child.tint = tint;
- // }
- // } else {
- // DEVICE_SPRITE_TINT[deviceType] != null && (child.tint = DEVICE_SPRITE_TINT[deviceType]);
- // }
- // }
- // })
+ mapContainer.children.forEach(child => {
+ const deviceType = child.data?.type;
+ if (deviceType) {
+ if (themeMode === 'dark') {
+ DEVICE_SPRITE_TINT_DARK[deviceType] != null && (child.tint = DEVICE_SPRITE_TINT_DARK[deviceType]);
+ } else {
+ DEVICE_SPRITE_TINT[deviceType] != null && (child.tint = DEVICE_SPRITE_TINT[deviceType]);
+ }
+ }
+ })
}
}
@@ -690,12 +688,12 @@
fill: 0x000000,
});
agvText.anchor.set(0.5, 0.5);
- agvText.position.set(0, 5);
+ agvText.position.set(0, 8);
agvSprite.addChild(agvText);
agvSprite.updateTextRotation = () => {
if (agvText && agvSprite) {
- agvText.rotation = -agvSprite.rotation;
+ agvText.rotation = -agvSprite.rotation - rotationParseNum(MAP_DEFAULT_ROTATION);
}
};
agvSprite.updateTextRotation();
@@ -719,7 +717,9 @@
if (error) {
agvSprite.tint = 0xff3f34;
} else {
- agvSprite.tint = 0xffffff;
+ agvSprite.tint = themeMode === 'dark'
+ ? DEVICE_SPRITE_TINT_DARK[DEVICE_TYPE.AGV]
+ : DEVICE_SPRITE_TINT[DEVICE_TYPE.AGV];
}
beInsight(agvSprite, setCurSprite);
@@ -746,7 +746,9 @@
}
agvPath = new PIXI.Graphics();
agvPath.name = agvPathName;
- agvPath.lineStyle(Math.max(20, 4 * (1 / mapContainer?.scale.x || 1)), 0x2f68ac, 0.8);
+ agvPath.lineStyle(Math.max(20, 4 * (1 / mapContainer?.scale.x || 1))
+ , themeMode === 'dark' ? 0x40739e : 0x2f68ac
+ , 0.8);
agvPath.zIndex = DEVICE_Z_INDEX.DYNAMIC_ROUTE;
// agvPath.blendMode = PIXI.BLEND_MODES.NORMAL;
--
Gitblit v1.9.1