From 665eabbc5ca78b04be5869d33fa9e9778c8c4235 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 May 2022 12:21:41 +0800 Subject: [PATCH] =?UTF-8?q?bus=E6=96=B9=E5=90=91=E7=9B=98UI=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E5=8E=9F=E8=AE=BE=E8=AE=A1=E5=B0=BA=E5=AF=B8?= =?UTF-8?q?=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/bus_p_base_fragment.xml | 8 +- .../drawable-xxhdpi/bg_steering_outer_bus.xml | 4 +- .../res/drawable-xxhdpi/steering_bg_bus.png | Bin 0 -> 23334 bytes .../res/layout/hmi_steering_wheel_bus.xml | 85 +++++++++--------- .../src/main/res/layout/hmi_tap_position.xml | 8 +- .../res/values-xhdpi-2560x1440/dimens.xml | 2 + .../res/values-xhdpi-2560x1600/dimens.xml | 2 + 7 files changed, 57 insertions(+), 52 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/steering_bg_bus.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml index fd30dd553b..7a3b8aff27 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml @@ -6,10 +6,10 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_bus.xml index f5e1da1a55..4af3f52cee 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_bus.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_bus.xml @@ -4,9 +4,9 @@ - + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/steering_bg_bus.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/steering_bg_bus.png new file mode 100644 index 0000000000000000000000000000000000000000..6065b75cdd589b54a9b04c70123dc771637edad2 GIT binary patch literal 23334 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 xq8?Z9N$JRa5*^M#00Iy=J_7f + android:layout_width="@dimen/dp_490" + android:layout_height="@dimen/dp_490" + android:background="@drawable/steering_bg_bus"> + + + + - - - 12px 20px + 22px + 88px 26px 30px 630px 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 index c4a29618fd..13f48cd860 100644 --- 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 @@ -13,6 +13,8 @@ 37px 27px 20px + 22px + 88px 90px 144px 186px