Merge branch 'ui' into dev_MogoAP_eagle-1030_211020_8.0.14

modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <dimen name="module_v2n_tip_text_margin_right">26px</dimen>
+    <dimen name="warning_distance_right">30px</dimen>
+</resources>

modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml

@@ -1127,6 +1127,7 @@
     <dimen name="module_v2n_tip_height">140px</dimen>
     <dimen name="module_v2n_tip_text_width">100px</dimen>
     <dimen name="module_v2n_tip_text_margin_right">28px</dimen>
+    <dimen name="warning_distance_right">30px</dimen>
     <dimen name="module_v2n_image_margin_left">28px</dimen>
     <dimen name="module_v2x_brake_tip_width">320px</dimen>
     <dimen name="module_v2x_brake_tip_height">140px</dimen>

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());
         }

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">
 
     <ImageView
         android:id="@+id/warning_type_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/module_v2n_image_margin_left"
         android:layout_centerVertical="true"
+        android:layout_marginLeft="@dimen/module_v2n_image_margin_left"
         android:src="@drawable/v2x_road_front_car_warning" />
 
     <TextView
@@ -20,9 +20,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:layout_marginRight="@dimen/dp_28"
+        android:layout_marginRight="@dimen/warning_distance_right"
         android:maxWidth="@dimen/module_v2n_tip_text_width"
-        android:text="112米"
+        android:text="1米"
         android:textColor="@color/v2x_FF3036"
         android:textSize="@dimen/dp_32" />
 

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": [

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": [

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": [