From 06f41295e614b2054d33ba7fd0422856275b49f4 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 13 May 2021 18:25:13 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E8=81=94=E6=83=B3=E9=80=82=E9=85=8Dv2n?=
 =?UTF-8?q?-=E5=BC=B9=E6=A1=86UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/values-xhdpi-2560x1600/dimens.xml    |   9 +++++++++
 .../src/main/res/values-xhdpi/dimens.xml          |   6 ++++++
 .../v2x_road_front_car_warning.png                | Bin
 .../v2x_road_front_dead_zone.png                  | Bin
 .../v2x_road_front_m_warning.png                  | Bin
 .../v2x_road_front_p_warning.png                  | Bin
 .../main/res/layout/v2x_road_front_warning_vr.xml |  14 +++++++-------
 7 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml
 rename modules/mogo-module-v2x/src/main/res/{drawable-xxhdpi => drawable-xhdpi-2560x1600}/v2x_road_front_car_warning.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xxhdpi => drawable-xhdpi-2560x1600}/v2x_road_front_dead_zone.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xxhdpi => drawable-xhdpi-2560x1600}/v2x_road_front_m_warning.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xxhdpi => drawable-xhdpi-2560x1600}/v2x_road_front_p_warning.png (100%)

diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml
new file mode 100644
index 0000000000..b693e5557c
--- /dev/null
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <dimen name="dp_32">42px</dimen>
+    <dimen name="module_v2n_tip_width">628px</dimen>
+    <dimen name="module_v2n_tip_height">188px</dimen>
+    <dimen name="module_v2n_tip_text_width">106px</dimen>
+    <dimen name="module_v2n_tip_text_margin_right">52px</dimen>
+    <dimen name="module_v2n_image_margin_left">37px</dimen>
+</resources>
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 eae48600b3..c81c22f39e 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
@@ -1123,5 +1123,11 @@
     <dimen name="module_map_amap_my_location_bg_size">360px</dimen>
     <dimen name="module_map_amap_my_location_icon_width">63px</dimen>
     <dimen name="module_map_amap_my_location_icon_height">96px</dimen>
+    <dimen name="module_v2n_tip_width">470px</dimen>
+    <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="module_v2n_image_margin_left">28px</dimen>
+
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_car_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_car_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_dead_zone.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_dead_zone.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_m_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_m_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_p_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_p_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png
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 1bce72aaed..f6e3f5199f 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
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_470"
-    android:layout_height="@dimen/dp_140"
+    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">
 
     <ImageView
         android:id="@+id/warning_type_image"
-        android:layout_width="@dimen/dp_100"
-        android:layout_height="@dimen/dp_100"
-        android:layout_marginLeft="@dimen/dp_28"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/module_v2n_image_margin_left"
         android:layout_marginTop="@dimen/dp_20"
         android:src="@drawable/v2x_road_front_car_warning" />
 
@@ -21,7 +21,7 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginRight="@dimen/dp_28"
-        android:maxWidth="@dimen/dp_100"
+        android:maxWidth="@dimen/module_v2n_tip_text_width"
         android:text="1.2米"
         android:textColor="@color/v2x_FF3036"
         android:textSize="@dimen/dp_32" />
@@ -33,7 +33,7 @@
         android:layout_alignEnd="@+id/warning_distance"
         android:layout_centerVertical="true"
         android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginRight="@dimen/dp_20"
+        android:layout_marginRight="@dimen/module_v2n_tip_text_margin_right"
         android:layout_toRightOf="@+id/warning_type_image"
         android:text="前车碰撞预警"
         android:textColor="#FFFFFF"