diff --git a/.idea/misc.xml b/.idea/misc.xml index 1e63ddb354..8a29932d64 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -19,8 +19,10 @@ - + + + diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java index c58f3d6e0a..0b4a6a65e9 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java @@ -164,7 +164,7 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener @@ -108,8 +109,8 @@ android:id="@+id/module_services_dispatch_dialog_confirm" android:layout_width="@dimen/module_services_dispatch_airport_dialog_affirm_width" android:layout_height="@dimen/module_services_dispatch_airport_dialog_affirm_height" + android:layout_below="@+id/module_services_dispatch_dialog_task_content" android:layout_centerHorizontal="true" - android:layout_alignTop="@+id/module_services_dispatch_dialog_task_content" android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_margin_top" android:layout_marginBottom="@dimen/module_services_dispatch_airport_dialog_margin_bottom" android:background="@drawable/bg_adas_dispatch_affirm" diff --git a/modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_cars.xml b/modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_cars.xml index 40def22dc7..f6178b469a 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_cars.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_cars.xml @@ -56,8 +56,8 @@ @@ -66,7 +66,6 @@ android:id="@+id/module_adas_dispatch_remind_affirm" android:layout_width="@dimen/module_services_dispatch_cars_dialog_btn_width" android:layout_height="@dimen/module_services_dispatch_cars_dialog_line_margin_bottom" - android:background="@drawable/module_service_dispatch_cars_affirm_bg" android:gravity="center" android:text="@string/module_services_dispatch_cars_affirm" android:textColor="@color/module_services_dispatch_cars_text_loc" @@ -78,6 +77,7 @@ android:layout_width="1px" android:layout_height="@dimen/module_services_dispatch_cars_dialog_line_margin_bottom" android:layout_marginStart="@dimen/module_services_dispatch_cars_dialog_btn_width" + android:background="@color/module_services_dispatch_cars_line" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" /> @@ -85,7 +85,6 @@ android:id="@+id/module_adas_dispatch_remind_cancel" android:layout_width="@dimen/module_services_dispatch_cars_dialog_btn_width" android:layout_height="@dimen/module_services_dispatch_cars_dialog_line_margin_bottom" - android:background="@drawable/module_service_dispatch_cars_cancel_bg" android:gravity="center" android:text="@string/module_services_dispatch_cars_cancel" android:textColor="@color/module_services_dispatch_cars_cancel" diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml index c0e3e70e77..3805a4709e 100644 --- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml @@ -73,9 +73,9 @@ 363px 466px 519px - 75px + 125px 639px - 70px + 100px 60px 525px 105px @@ -91,6 +91,7 @@ 134px 42px 188px + 115px 114px 355px 15px