From a77bd16c0b0cba088d4cdfb69cd1c035c5faa22e Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 19 Sep 2023 17:36:04 +0800 Subject: [PATCH] =?UTF-8?q?[6.1.0]=20=E7=BE=8E=E5=8C=96=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E8=87=AA=E9=A9=BE=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/callback/ITaxiADASStatusCallback.java | 2 ++ .../com/mogo/och/taxi/ui/base/TaxiPresenter.java | 5 +++++ .../java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 13 +++++-------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java index 7e8a6673f3..b1f80cf372 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java @@ -23,4 +23,6 @@ public interface ITaxiADASStatusCallback { //自驾返回失败 void onStartAdasFailure(); + + void updateAutopilotStatus(); } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java index 8b4ef9fda0..128ecc72e1 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java @@ -133,6 +133,11 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS runOnUIThread(() -> mView.stopAnimAndUpdateBtnStatus()); } + @Override + public void updateAutopilotStatus() { + mView.updateAutopilotStatus(CallerAutoPilotStatusListenerManager.INSTANCE.getState()); + } + @Override public void onNaviToEnd(boolean isAmap, boolean isShow) { runOnUIThread(() -> mView.onNaviToEnd(isAmap, isShow)); diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index bdb238278b..267cd84f5f 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -322,10 +322,8 @@ object TaxiTaskModel { DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_AUTOPILOT_ENABLE，meaning=可自动驾驶，人工干预状态") if ((FunctionBuildConfig.isDemoMode && checkCurrentTaskCondition() - && (QueryCurrentTaskRespBean.isOrderOnTheWayToEnd(mCurrentTaskWithOrder) - || QueryCurrentTaskRespBean.isOrderArriveAtEnd(mCurrentTaskWithOrder)) - ) - ) { + && QueryCurrentTaskRespBean.isStartTaskType(mCurrentTaskWithOrder) + )){ // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态 return } @@ -334,8 +332,7 @@ object TaxiTaskModel { DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_AUTOPILOT_DISABLE，meaning=不可自动驾驶") if ((FunctionBuildConfig.isDemoMode && checkCurrentTaskCondition() - && (QueryCurrentTaskRespBean.isOrderOnTheWayToEnd(mCurrentTaskWithOrder) - || QueryCurrentTaskRespBean.isOrderArriveAtEnd(mCurrentTaskWithOrder)) + && QueryCurrentTaskRespBean.isStartTaskType(mCurrentTaskWithOrder) ) ) { // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态 @@ -348,8 +345,7 @@ object TaxiTaskModel { DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_PARALLEL_DRIVING，meaning=平行驾驶中") if (FunctionBuildConfig.isDemoMode) { if ((checkCurrentTaskCondition() - && (QueryCurrentTaskRespBean.isOrderOnTheWayToEnd(mCurrentTaskWithOrder) - || QueryCurrentTaskRespBean.isOrderArriveAtEnd(mCurrentTaskWithOrder)) + && QueryCurrentTaskRespBean.isStartTaskType(mCurrentTaskWithOrder) ) ) { //订单中 // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态 @@ -757,6 +753,7 @@ object TaxiTaskModel { //注意: 需要去除到达乘客上车点的节点, 这个节点不拉取任务 if (result?.currentStatus == TaskStatusEnum.CompleteTask.code ) { + mADASStatusCallback?.updateAutopilotStatus() mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value listener.onTaskCompleted(result)