From e3104e2c45b950b954514c4d510fffbd9e8d9639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 13 May 2021 16:35:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86V2X=E4=B8=ADPad?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/module_mogo_och_base_fragment.xml | 3 +- .../res/values-xhdpi-2560x1600/dimens.xml | 1 + OCH/mogo-och/src/main/res/values/dimens.xml | 1 + .../v2x_optimal_route_warning.png | Bin 0 -> 7004 bytes .../main/res/layout/vr_window_top_tips.xml | 4 +- .../src/main/res/values-ldpi/dimens.xml | 5 + .../src/main/res/values-mdpi/dimens.xml | 5 + .../res/values-xhdpi-1920x1000/dimens.xml | 5 + .../res/values-xhdpi-2560x1600/dimens.xml | 98 ++++++++++++++++++ .../src/main/res/values-xhdpi/dimens.xml | 5 + 10 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png create mode 100644 modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml diff --git a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml index 8e31eb693a..f7c61df715 100644 --- a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml +++ b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml @@ -49,9 +49,10 @@ android:textAlignment="center" android:textColor="@color/module_mogo_och_autopilot_text_color_selector" android:textSize="@dimen/module_mogo_och_autopilot_status_text_size" + android:layout_marginLeft="@dimen/module_mogo_och_autopilot_status_text_m_l" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toLeftOf="@+id/module_mogo_och_autopilot_status" /> + app:layout_constraintLeft_toLeftOf="parent" /> 44px 13px 12px + 224px 460px 30px diff --git a/OCH/mogo-och/src/main/res/values/dimens.xml b/OCH/mogo-och/src/main/res/values/dimens.xml index b3352fd0e7..84f4ec5a14 100644 --- a/OCH/mogo-och/src/main/res/values/dimens.xml +++ b/OCH/mogo-och/src/main/res/values/dimens.xml @@ -33,6 +33,7 @@ 30px 13px 12px + 188px 460px 30px 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-2560x1600/v2x_optimal_route_warning.png new file mode 100644 index 0000000000000000000000000000000000000000..76ae6f035a38ff44d7cdebf8ea7565cc200f90f9 GIT binary patch literal 7004 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 44px 19px + + + 133px + 42px + 572px 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 a580148415..2344ee5dea 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 @@ -99,6 +99,11 @@ 14px 44px 19px + + + 133px + 42px + 572px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index 091c72520e..b43ce52f75 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -80,6 +80,11 @@ 26px 80px 34px + + + 100px + 32px + 940px 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 new file mode 100644 index 0000000000..e5e04824ef --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -0,0 +1,98 @@ + + + + 800px + + 32px + 32px + + 390px + 410px + + + 160px + + + 60px + 40px + + 80px + + 15px + 550px + 200px + 200px + 100px + 90px + 162px + 64px + 80px + 26px + 270px + 86px + 58px + 48px + 48px + 349px + 465px + 306px + 77px + 50px + 28px + 16px + 5px + 80px + 22px + + 20px + 30px + + 42px + 30px + 36px + 30px + 50px + + 120px + + 158px + + + 20px + 36px + 28px + 55px + 36px + 310px + 110px + 120px + + + 270px + 480px + 330px + 450px + + + 200px + + 75px + 32px + 26px + 80px + 34px + + + 133px + 42px + + + + 940px + 701px + 150px + 46px + 26px + + + 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 1882f8ea15..6c0cad7db0 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 @@ -113,6 +113,11 @@ 26px 80px 34px + + + 133px + 42px + 940px