From 728b4bd2de0c0d5aff6535d222299166938fa9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 17 May 2021 16:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E4=BC=98=E8=BD=A6?=
 =?UTF-8?q?=E9=81=93=E6=8E=A8=E8=8D=90ui=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module_v2x_vr_close.png                   | Bin
 .../v2x_optimal_route_warning.png             | Bin
 .../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/vr_window_top_tips.xml    |   2 +-
 .../src/main/res/values-ldpi/dimens.xml       |   4 +-
 .../src/main/res/values-mdpi/dimens.xml       |   4 +-
 .../res/values-xhdpi-2560x1440/dimens.xml     |   5 +
 .../res/values-xhdpi-2560x1600/dimens.xml     | 105 ------------------
 .../src/main/res/values-xhdpi/dimens.xml      |   4 +-
 12 files changed, 12 insertions(+), 112 deletions(-)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_v2x_vr_close.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_optimal_route_warning.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_road_front_car_warning.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_road_front_dead_zone.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_road_front_m_warning.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_road_front_p_warning.png (100%)
 delete mode 100644 modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/module_v2x_vr_close.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/module_v2x_vr_close.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_optimal_route_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_optimal_route_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_car_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_car_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_dead_zone.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_dead_zone.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_m_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_m_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_p_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_p_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
index c99774a6e4..446e5c311e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
@@ -28,7 +28,7 @@
         android:layout_marginRight="@dimen/dp_20"
         android:text="为您推荐最优路线"
         android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/module_v2x_event_warning_type_text_size"
         app:layout_constraintBottom_toBottomOf="@+id/warning_type_image"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/warning_type_image"
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index 2815a726e6..a7c7e3c3dd 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -101,8 +101,8 @@
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
 
     <!--最优路线-->
-    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
-    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+    <dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
 
     <!--适配 V2X 弹窗 UI-->
 
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 2344ee5dea..af1575dcd3 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -101,8 +101,8 @@
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
 
     <!--最优路线-->
-    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
-    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+    <dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
 
     <!--适配 V2X 弹窗 UI-->
 
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
index e09973a74e..3213f45db8 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -31,4 +31,9 @@
     <dimen name="module_v2x_car_for_help_event_maxwidth">480px</dimen>
     <dimen name="module_v2x_car_for_help_event_text_size">42px</dimen>
     <dimen name="module_v2x_car_for_help_cancel_text_size">40px</dimen>
+
+    <!--最优路线-->
+    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
deleted file mode 100644
index 1978407261..0000000000
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <!--联想PAD适配-->
-    <dimen name="module_main_v2x_animation_width">800px</dimen>
-
-    <dimen name="module_v2x_search_marginLeft">32px</dimen>
-    <dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
-
-    <dimen name="module_v2x_push_img_height">390px</dimen>
-    <dimen name="module_v2x_push_img_container_height">410px</dimen>
-
-
-    <dimen name="module_v2x_event_icon_size">160px</dimen>
-
-
-    <dimen name="module_v2x_event_distance_text">60px</dimen>
-    <dimen name="module_v2x_event_distance_title">40px</dimen>
-
-    <dimen name="module_v2x_history_event_icon_size">80px</dimen>
-
-    <dimen name="module_ext_top_view_no_link_width_in_vr_mode">778px</dimen>
-    <dimen name="module_v2x_event_see_live_window_height_vr">687px</dimen>
-    <dimen name="module_v2x_event_window_top_margin_vr">200px</dimen>
-    <dimen name="module_v2x_event_window_close_distance">10px</dimen>
-    <dimen name="module_v2x_event_window_height_vr_for_item">487px</dimen>
-    <dimen name="module_v2x_event_window_width_vr">778px</dimen>
-
-    <dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
-    <dimen name="module_v2x_map_left">550px</dimen>
-    <dimen name="module_v2x_map_top">200px</dimen>
-    <dimen name="module_v2x_map_right">200px</dimen>
-    <dimen name="module_v2x_map_bottom">100px</dimen>
-    <dimen name="module_v2x_surrounding_top_height">90px</dimen>
-    <dimen name="module_v2x_surrounding_top_bt_width">162px</dimen>
-    <dimen name="module_v2x_surrounding_top_bt_height">64px</dimen>
-    <dimen name="module_v2x_surrounding_empty_iv_margin_top">80px</dimen>
-    <dimen name="module_v2x_surrounding_empty_tv_margin_top">26px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_width">270px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_height">86px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_margin_top">58px</dimen>
-    <dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
-    <dimen name="module_v2x_surrounding_margin_left">48px</dimen>
-    <dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
-    <dimen name="module_v2x_surrounding_item_width">465px</dimen>
-    <dimen name="module_v2x_surrounding_item_height">306px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_image_height">50px</dimen>
-    <dimen name="module_v2x_surrounding_item_marigin_left">28px</dimen>
-    <dimen name="module_v2x_surrounding_item_marigin_bottom_left">16px</dimen>
-    <dimen name="module_v2x_panel_surrounding_marginbottom">5px</dimen>
-    <dimen name="module_v2x_panel_surrounding_stance">80px</dimen>
-    <dimen name="module_v2x_surrounding_top">22px</dimen>
-
-    <dimen name="module_v2x_surrounding_list_margin_left">20px</dimen>
-    <dimen name="module_v2x_surrounding_item_margin_left">30px</dimen>
-
-    <dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
-    <dimen name="module_v2x_surrounding_top_textsize">30px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
-    <dimen name="module_v2x_surrounding_item_maigin_left">50px</dimen>
-
-    <dimen name="module_v2x_panel_width">120px</dimen>
-
-    <dimen name="module_v2x_panel_tab_height">158px</dimen>
-
-    <!--适配 V2X 弹窗 UI-->
-    <dimen name="module_v2x_event_type_title_text_size">20px</dimen>
-    <dimen name="module_v2x_event_title_text_size">36px</dimen>
-    <dimen name="module_v2x_event_sub_title_text_size">28px</dimen>
-    <dimen name="module_v2x_event_head_size">55px</dimen>
-    <dimen name="module_v2x_event_live_error_text_size">36px</dimen>
-    <dimen name="module_v2x_live_window_height">310px</dimen>
-    <dimen name="module_v2x_event_button_size">110px</dimen>
-    <dimen name="module_v2x_event_button_size_detail">120px</dimen>
-
-    <!--道路事件 高的弹窗-->
-    <dimen name="module_v2x_event_image_height">270px</dimen>
-    <dimen name="module_v2x_event_image_width">480px</dimen>
-    <dimen name="module_v2x_event_window_height">330px</dimen>
-    <dimen name="module_v2x_event_window_height_ground">450px</dimen>
-
-    <!--疲劳驾驶、违章停车、道路求助-->
-    <dimen name="module_v2x_fatigue_driving_window_height_ground">200px</dimen>
-
-    <dimen name="module_v2x_event_help_head_size">75px</dimen>
-    <dimen name="module_v2x_event_help_title_text_size">32px</dimen>
-    <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
-    <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
-    <dimen name="module_v2x_event_parking_text_size">34px</dimen>
-
-    <!--最优路线-->
-    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
-    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
-
-    <!--适配 V2X 弹窗 UI-->
-
-    <dimen name="module_v2x_event_panel_btn_x">940px</dimen>
-    <dimen name="module_v2x_event_panel_btn_y">701px</dimen>
-    <dimen name="v2x_driving_width">150px</dimen>
-    <dimen name="v2x_driving_heigt">46px</dimen>
-    <dimen name="v2x_recommond_route_size">26px</dimen>
-
-
-</resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 8e83da6e51..9229a21b5a 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -117,8 +117,8 @@
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
 
     <!--最优路线-->
-    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
-    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+    <dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
 
     <!--适配 V2X 弹窗 UI-->