yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus方向盘UI修改,原设计尺寸小

Browse Source
This commit is contained in:
liujing
2022-05-26 12:21:41 +08:00
parent 7d0ebeb75d
commit 665eabbc5c
7 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
View File

@@ -6,10 +6,10 @@
<com.mogo.eagle.core.function.hmi.ui.widget.SteeringWheelView
android:id="@+id/steering_wheel"
android:layout_width="@dimen/dp_300"
android:layout_height="@dimen/dp_300"
android:layout_marginLeft="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_112"
android:layout_width="@dimen/dp_490"
android:layout_height="@dimen/dp_490"
android:layout_marginLeft="@dimen/dp_22"
android:layout_marginTop="@dimen/dp_88"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />

4
core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_bus.xml
View File

@@ -4,9 +4,9 @@
<shape
android:innerRadius="@dimen/dp_85"
android:shape="ring"
android:thickness="4px"
android:thickness="6px"
android:useLevel="false">
<solid android:color="#BBCFF6" />
<solid android:color="#66BBCFF6" />
</shape>
</item>

BIN
core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/steering_bg_bus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

85
core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml
View File

@@ -1,35 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_steering_wheel_bus">
android:layout_width="@dimen/dp_490"
android:layout_height="@dimen/dp_490"
android:background="@drawable/steering_bg_bus">
<ProgressBar
android:id="@+id/blue_circle"
android:layout_width="@dimen/dp_180"
android:layout_height="@dimen/dp_180"
android:layout_width="@dimen/dp_278"
android:layout_height="@dimen/dp_278"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_38"
android:layout_marginRight="@dimen/dp_60"
android:layout_marginLeft="@dimen/dp_84"
android:layout_marginTop="@dimen/dp_54"
android:layout_marginRight="@dimen/dp_85"
android:indeterminateDrawable="@drawable/bg_steering_outer_bus"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.hmi.ui.widget.CircularProgressView
android:id="@+id/steering_circular"
android:layout_width="@dimen/dp_278"
android:layout_height="@dimen/dp_278"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_54"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:progWidth="12px"
app:progress="0" />
<ImageView
android:id="@+id/autopilot_iv"
android:layout_width="@dimen/dp_228"
android:layout_height="@dimen/dp_228"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:src="@drawable/bg_auto"
app:layout_constraintBottom_toBottomOf="@+id/steering_circular"
app:layout_constraintLeft_toLeftOf="@+id/steering_circular"
app:layout_constraintRight_toRightOf="@+id/steering_circular"
app:layout_constraintTop_toTopOf="@+id/steering_circular" />
<TextView
android:id="@+id/steering_tv_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_72"
android:layout_marginRight="-10px"
android:gravity="right"
android:text="180°"
android:textColor="#415479"
android:textSize="@dimen/dp_26"
android:textSize="@dimen/dp_38"
android:visibility="invisible"
app:layout_constraintRight_toLeftOf="@+id/blue_circle"
app:layout_constraintRight_toLeftOf="@+id/steering_circular"
app:layout_constraintTop_toTopOf="parent" />
<TextView
@@ -37,42 +62,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="-10px"
android:layout_marginTop="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_72"
android:gravity="left"
android:text="180°"
android:textColor="#415479"
android:textSize="@dimen/dp_26"
app:layout_constraintLeft_toRightOf="@+id/autopilot_iv"
android:textSize="@dimen/dp_38"
app:layout_constraintLeft_toRightOf="@+id/steering_circular"
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.hmi.ui.widget.CircularProgressView
android:id="@+id/steering_circular"
android:layout_width="@dimen/dp_180"
android:layout_height="@dimen/dp_180"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_36"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:progWidth="8px"
app:progress="0" />
<ImageView
android:id="@+id/autopilot_iv"
android:layout_width="@dimen/dp_186"
android:layout_height="@dimen/dp_186"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_34"
android:src="@drawable/bg_auto"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_width="@dimen/dp_58"
android:layout_height="@dimen/dp_58"
android:src="@drawable/icon_in_steering"
app:layout_constraintBottom_toBottomOf="@+id/autopilot_iv"
app:layout_constraintLeft_toLeftOf="@+id/autopilot_iv"
@@ -82,9 +83,9 @@
<com.mogo.eagle.core.function.hmi.ui.widget.TapPositionView
android:id="@+id/tap_position"
android:layout_width="@dimen/dp_240"
android:layout_width="@dimen/dp_390"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_42"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"

8
core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml
View File

@@ -13,7 +13,7 @@
android:text="P"
android:textAlignment="center"
android:textColor="#6E8EC9"
android:textSize="@dimen/dp_32"
android:textSize="@dimen/dp_46"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@@ -28,7 +28,7 @@
android:text="R"
android:textAlignment="center"
android:textColor="#6E8EC9"
android:textSize="@dimen/dp_32"
android:textSize="@dimen/dp_46"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/tap_p"
@@ -43,7 +43,7 @@
android:text="N"
android:textAlignment="center"
android:textColor="#6E8EC9"
android:textSize="@dimen/dp_32"
android:textSize="@dimen/dp_46"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/tap_r"
@@ -58,7 +58,7 @@
android:text="D"
android:textAlignment="center"
android:textColor="#0043FF"
android:textSize="@dimen/dp_32"
android:textSize="@dimen/dp_46"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/tap_n"

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

@@ -2,6 +2,8 @@
<resources>
<dimen name="dp_12">12px</dimen>
<dimen name="dp_20">20px</dimen>
<dimen name="dp_22">22px</dimen>
<dimen name="dp_88">88px</dimen>
<dimen name="module_v2n_tip_text_margin_right">26px</dimen>
<dimen name="warning_distance_right">30px</dimen>
<dimen name="dp_630">630px</dimen>

2
modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml
View File

@@ -13,6 +13,8 @@
<dimen name="module_v2x_brake_image_margin_left">37px</dimen>
<dimen name="module_v2x_brake_image_margin_right">27px</dimen>
<dimen name="dp_20">20px</dimen>
<dimen name="dp_22">22px</dimen>
<dimen name="dp_88">88px</dimen>
<dimen name="dp_90">90px</dimen>
<dimen name="dp_144">144px</dimen>
<dimen name="dp_186">186px</dimen>