From 7a95ecd63a865b01d7e778dbbeb6678bbdd23c73 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 29 Mar 2021 12:02:26 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E9=A2=84=E8=AD=A6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B5=84=E6=BA=90=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scenario/scene/warning/V2XWarningWindow.java | 12 ++++++++++++ .../drawable-xhdpi/v2x_road_front_m_warning.png | Bin 0 -> 4395 bytes .../drawable-xhdpi/v2x_road_front_p_warning.png | Bin 0 -> 4523 bytes 3 files changed, 12 insertions(+) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_road_front_m_warning.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_road_front_p_warning.png diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java index 5e0406c42e..4b609c7777 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java @@ -62,6 +62,18 @@ public class V2XWarningWindow extends V2XBasWindow implements IV2XWindow { public void show(Object entity) { if (entity != null) { mV2XWarningEntity = (V2XWarningEntity) entity; + //行人0/自行车1/摩托车2/小汽车3/公交车4 + switch (mV2XWarningEntity.getType()) { + case 0: + typeImage.setImageResource(R.drawable.v2x_road_front_p_warning); + break; + case 1: + case 2: + typeImage.setImageResource(R.drawable.v2x_road_front_p_warning); + break; + default: + break; + } distance.setText(String.valueOf(mV2XWarningEntity.getDistance()) + "米"); warningTextView.setText(mV2XWarningEntity.getTipContent()); AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice(mV2XWarningEntity.getTts()); diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_road_front_m_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_road_front_m_warning.png new file mode 100644 index 0000000000000000000000000000000000000000..26ca1bb28f8212c233a1f7d5510795bd4721b56f GIT binary patch literal 4395 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 JPDHLkV1gBTpSA!1 literal 0 HcmV?d00001