diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 160fe20f3f..1e774098a4 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1166,11 +1166,16 @@ public class TaxiModel { mPrevAPStatus = state; }else if (state == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING){ - if (FunctionBuildConfig.isDemoMode - && checkCurrentOCHOrder() - && (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd - || getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) { - // 当美化模式(演示模式)开启时:且有订单、且为去往目的地状态,维持自动驾驶icon开启状态 + if (FunctionBuildConfig.isDemoMode){ + if (checkCurrentOCHOrder() + && (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd + || getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)){//订单中 + // 当美化模式(演示模式)开启时:且有订单、且为去往目的地状态,维持自动驾驶icon开启状态 + }else { //美化模式下没订单,显示人工驾驶 + if (mADASStatusCallback != null){ + mADASStatusCallback.onAutopilotDisable(); + } + } return; } if (state != mPrevAPStatus && mADASStatusCallback != null){