From cbaf6dd2a8dfd4aad02fd85923b24fc19696ba51 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 22 Nov 2021 18:46:26 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E5=BC=B1=E5=8A=BF=E4=BA=A4=E9=80=9A?= =?UTF-8?q?=E9=A2=84=E8=AD=A6,=E8=B7=9D=E7=A6=BB=E5=9B=9B=E8=88=8D?= =?UTF-8?q?=E4=BA=94=E5=85=A5=E5=8F=96=E6=95=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values-xhdpi-2560x1440/dimens.xml | 5 +++++ .../src/main/res/values-xhdpi/dimens.xml | 1 + .../v2x/scenario/scene/warning/V2XWarningWindow.java | 8 +++++++- .../src/main/res/layout/v2x_road_front_warning_vr.xml | 10 +++++----- .../main/res/raw/scenario_warning_event_data_left.json | 2 +- .../raw/scenario_warning_event_data_pedestrians.json | 2 +- .../res/raw/scenario_warning_event_data_right.json | 2 +- 7 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml new file mode 100644 index 0000000000..3249cb0f6a --- /dev/null +++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -0,0 +1,5 @@ + + + 26px + 30px + diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml index c43fe754e8..55b3e86c7b 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml @@ -1127,6 +1127,7 @@ 140px 100px 28px + 30px 28px 320px 140px 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 6547d40392..62e126a6d4 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 @@ -17,6 +17,8 @@ import com.mogo.module.v2x.listener.V2XWindowStatusListener; import com.mogo.module.v2x.scenario.scene.V2XBasWindow; import com.mogo.module.v2x.scenario.view.IV2XWindow; +import java.math.BigDecimal; + /** * @author liujing * @description 车路云—场景预警 http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=52829799 @@ -74,7 +76,11 @@ public class V2XWarningWindow extends V2XBasWindow implements IV2XWindow { default: break; } - distance.setText(String.valueOf(mV2XWarningEntity.getDistance()) + "米"); + double dis = mV2XWarningEntity.getDistance(); + //距离四舍五入保留整数 + BigDecimal bg = new BigDecimal(dis); + double disBig = bg.setScale(0, BigDecimal.ROUND_HALF_UP).doubleValue(); + distance.setText(String.format("%.0f", disBig) + "米"); warningTextView.setText(mV2XWarningEntity.getWarningContent());//验证云端数据是否 AIAssist.getInstance(Utils.getApp()).speakTTSVoice(mV2XWarningEntity.getTts()); } diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_front_warning_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_front_warning_vr.xml index 9650121be9..680887c2ab 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_front_warning_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_front_warning_vr.xml @@ -3,15 +3,15 @@ android:layout_width="@dimen/module_v2n_tip_width" android:layout_height="@dimen/module_v2n_tip_height" android:layout_marginLeft="@dimen/dp_190" - android:background="@drawable/v2x_front_warning_bg" - android:layout_marginTop="@dimen/dp_20"> + android:layout_marginTop="@dimen/dp_20" + android:background="@drawable/v2x_front_warning_bg"> diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json index 6fe3edc623..cfc0adb166 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json @@ -2,7 +2,7 @@ "type": 2, "lat": 26.879024, "lon": 112.568783, - "distance": 2, + "distance": 2.234, "collisionLat": 26.8791769, "collisionLon": 112.56896496, "stopLines": [ diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json index 0a48613c3c..6226dfd0de 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json @@ -2,7 +2,7 @@ "type": 1, "lat": 26.87912015, "lon": 112.56885373, - "distance": 2, + "distance": 2.678, "collisionLat": 26.8791769, "collisionLon": 112.56896496, "stopLines": [ diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json index 6bba8cf023..f7a4f98d26 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json @@ -2,7 +2,7 @@ "type": 4, "lat": 26.879339, "lon": 112.568933, - "distance": 2, + "distance": 2.845, "collisionLat": 26.8791769, "collisionLon": 112.56896496, "stopLines": [