From 79d73095cddbe3ae2d893612a9c077d4125ba360 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 6 May 2024 20:52:44 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[taxi=20=E8=B7=9D=E7=A6=BB=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/shuttle/model/OrderModel.java | 2 +- OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java index e7dc5fe754..c329d8a4eb 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java @@ -638,7 +638,7 @@ public class OrderModel { } } //2、6个条件判断 - if (!CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(true)) { + if (!CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(true,0)) { return; } // 3、距离轨迹15m计算 diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml b/OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml index f847e6b278..76cd62f84a 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml @@ -94,6 +94,7 @@ android:id="@+id/module_och_taxi_order_distance_anchor_2" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="264dp" android:inputType="textMultiLine" android:lineSpacingExtra="16dp" android:text="距离 - - 公里，用时 - - 分" @@ -145,8 +146,7 @@ app:layout_constraintTop_toBottomOf="@+id/taxi_passenger_phone" app:layout_constraintLeft_toLeftOf="@+id/taxi_passenger_num" app:layout_constraintRight_toRightOf="parent" - android:layout_marginTop="@dimen/dp_15" - android:background="@color/taxi_passenger_line_color"/> + android:layout_marginTop="@dimen/dp_15" />