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

[3.4.0]

Browse Source 
[ui调整]
This commit is contained in:
yangyakun
2023-07-27 12:32:47 +08:00
parent a6c8b4826d
commit 018f224d9c
12 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 323 KiB

After

Width:  |  Height:  |  Size: 339 KiB

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 100 KiB

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 221 KiB

After

Width:  |  Height:  |  Size: 169 KiB

5
OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_bottom_bg.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:endColor="@color/taxi_p_5D6A8C" android:centerColor="@color/taxi_p_995D6A8C" android:startColor="@color/taxi_p_005D6A8C" android:angle="270"/>
</shape>

8
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
View File

@@ -19,8 +19,8 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/taxi_p_passenger_arrived_close"
android:layout_marginEnd="@dimen/dp_70"
android:layout_marginTop="@dimen/dp_140"
android:layout_marginEnd="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_50"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"/>
@@ -70,6 +70,7 @@
android:layout_height="@dimen/dp_339"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_title_01"
app:layout_constraintStart_toStartOf="@+id/v_xiaozhi_belt_info_bg"
app:layout_constraintEnd_toEndOf="@+id/v_xiaozhi_belt_info_bg"
app:layout_constraintTop_toTopOf="@+id/v_xiaozhi_belt_info_bg"
@@ -82,9 +83,8 @@
<androidx.appcompat.widget.AppCompatTextView
app:layout_constraintEnd_toEndOf="@+id/v_xiaozhi_belt_info_bg"
app:layout_constraintBottom_toBottomOf="@+id/v_xiaozhi_belt_info_bg"
app:layout_constraintStart_toStartOf="@+id/v_xiaozhi_belt_info_bg"
app:layout_constraintStart_toStartOf="@+id/actv_title_01"
android:layout_marginBottom="@dimen/dp_67"
android:text="记得在小程序完成支付哦~"
android:textColor="@android:color/white"

7
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -12,6 +12,8 @@
app:resetDrawable="@null"
app:startPointDrawable="@drawable/taxi_p_map_view_dir_start"
app:endPointDrawable="@drawable/taxi_p_map_view_dir_end"
app:carDrawable="@drawable/taxi_p_map_car"
app:compassDrawable="@drawable/taxi_p_map_car_light"
app:mapStyleExtraPath="style_extra.data"
app:mapStylePath="style.data"
app:leftPadding="80"
@@ -132,10 +134,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_82"
android:src="@drawable/taxi_p_xioazhi_normal"
android:layout_marginBottom="@dimen/dp_28"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_width="@dimen/dp_216"
android:layout_height="@dimen/dp_216"/>
<!--气泡态消息盒子-->
<com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView

3
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml
View File

@@ -13,12 +13,13 @@
android:format12Hour="M月d日 HH:mm"
android:format24Hour="M月d日 HH:mm"
android:gravity="center"
android:fontFamily="@font/din"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:textColor="@color/taxi_p_111D2F"
android:textSize="@dimen/dp_52"
android:layout_marginStart="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_92"
android:letterSpacing="-0.05"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>

4
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml
View File

@@ -23,6 +23,7 @@
android:layout_marginStart="@dimen/dp_90"
android:textColor="@color/taxi_p_203555"
android:textSize="@dimen/dp_150"
android:fontFamily="@font/din"
android:textScaleX="0.9"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -84,6 +85,7 @@
android:layout_marginTop="@dimen/dp_51"
android:layout_marginStart="@dimen/dp_58"
android:textSize="@dimen/dp_61"
android:fontFamily="@font/din"
app:layout_constraintHorizontal_chainStyle="spread"
android:textColor="@color/taxi_p_081831"
app:layout_constraintEnd_toStartOf="@+id/actv_surplus_time"
@@ -108,6 +110,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="@dimen/dp_61"
android:fontFamily="@font/din"
android:textColor="@color/taxi_p_081831"
app:layout_constraintEnd_toStartOf="@+id/actv_arrived_time"
app:layout_constraintStart_toEndOf="@+id/actv_distance"
@@ -134,6 +137,7 @@
android:textColor="@color/taxi_p_081831"
android:layout_marginEnd="@dimen/dp_58"
android:text="--"
android:fontFamily="@font/din"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/actv_surplus_time"
app:layout_constraintTop_toTopOf="@+id/actv_distance" />

10
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
View File

@@ -23,8 +23,8 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/taxi_p_passenger_arrived_close"
android:layout_marginEnd="@dimen/dp_70"
android:layout_marginTop="@dimen/dp_140"
android:layout_marginEnd="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_50"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"/>
@@ -54,6 +54,12 @@
app:layout_constraintLeft_toLeftOf="@+id/taxi_p_autopilot_btn_bg"
app:layout_constraintRight_toRightOf="@+id/taxi_p_autopilot_btn_bg" />
<View
app:layout_constraintBottom_toBottomOf="parent"
android:background="@drawable/taxi_p_start_autopilot_bottom_bg"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_250"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_orderinfo"

3
OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
View File

@@ -86,6 +86,9 @@
<color name="taxi_p_255BAA">#255BAA</color>
<color name="taxi_p_80F8FF">#80F8FF</color>
<color name="taxi_p_2B364B">#2B364B</color>
<color name="taxi_p_005D6A8C">#005D6A8C</color>
<color name="taxi_p_5D6A8C">#5D6A8C</color>
<color name="taxi_p_995D6A8C">#995D6A8C</color>

3
OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml
View File

@@ -12,6 +12,7 @@
</style>
<style name="och_check_number_checked">
<item name="android:fontFamily">@font/din</item>
<item name="android:background">@drawable/bg_taxi_p_checked_input_background</item>
<item name="android:textColor">@color/taxi_p_check_keyboard_input_field_checked</item>
</style>
@@ -23,6 +24,7 @@
<item name="android:shadowRadius">20</item>
<item name="android:textSize">@dimen/dp_87</item>
<item name="android:gravity">center</item>
<item name="android:fontFamily">@font/din</item>
<item name="android:layout_width">@dimen/dp_173</item>
<item name="android:layout_height">@dimen/dp_173</item>
</style>
@@ -32,6 +34,7 @@
<item name="android:layout_height">@dimen/dp_92</item>
<item name="android:background">@drawable/bg_taxi_p_keyboard_background</item>
<item name="android:gravity">center</item>
<item name="android:fontFamily">@font/din</item>
<item name="android:textColor">@color/taxi_p_282F62</item>
<item name="android:textSize">@dimen/dp_65</item>
</style>