From eccdbfbd793f5ca748578a36741a64e0c44a1d89 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 24 Jul 2024 20:13:57 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0][UI=E8=B5=B0=E6=9F=A5]=20=E7=BB=BF?= =?UTF-8?q?=E6=B3=A2=E9=80=9A=E8=A1=8C=E5=BC=95=E5=AF=BC=E7=BA=BF=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/greenwave/GreenWaveView.kt | 2 +- .../business/routeoverlay/RouteOverlayDrawer.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt index c5005ab3c8..806c1c4aca 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt @@ -103,7 +103,7 @@ class GreenWaveView: LinearLayout, IMoGoChassisLocationGCJ02Listener, RecyclerVi override fun run() { val rv: RecyclerView? = if (isDriver) driver_wave_rv else passenger_wave_rv - rv?.scrollBy(-3, 0) + rv?.scrollBy(-6, 0) postDelayed(this, 20) } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java index e2cb8cbbcb..bdbd113d63 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java @@ -65,10 +65,17 @@ public class RouteOverlayDrawer { }; renderTask.start(); //Color.parseColor("#996DFED0"), Color.parseColor("#CC6DFED0"), Color.parseColor("#C76DFED0"), Color.parseColor("#006DFED0") - greenWaveColors.add(Color.parseColor("#996DFED0")); - greenWaveColors.add(Color.parseColor("#CC6DFED0")); - greenWaveColors.add(Color.parseColor("#C76DFED0")); - greenWaveColors.add(Color.parseColor("#006DFED0")); + ArrayList> temps = new ArrayList<>(); + temps.add(new Pair<>(0, 51)); + temps.add(new Pair<>(10, 102)); + temps.add(new Pair<>(30, 51)); + temps.add(new Pair<>(100, 0)); + List alphas = MapTools.INSTANCE.getColorAlpha(temps); + if (alphas != null && !alphas.isEmpty()) { + for (int i : alphas) { + greenWaveColors.add(Color.argb(i, 109,254,208)); + } + } } }