diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java index 91427ad8da..3f18527f57 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java @@ -926,6 +926,8 @@ public class MogoOCHTaxiModelNew { } private IMoGoAutopilotStatusListener mGoAutopilotStatusListener = new IMoGoAutopilotStatusListener(){ + private boolean arriveAtEnd = false; //乘客app专用字段 + @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; @@ -942,9 +944,31 @@ public class MogoOCHTaxiModelNew { } } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { mPrevAPStatus = state; + + if (FunctionBuildConfig.isDemoMode + && FunctionBuildConfig.appIdentityMode == 1) { + // 当美化模式(演示模式)开启时:且是乘客app、且未到终点时,维持自动驾驶icon开启状态 + if (!arriveAtEnd) { + return; + } else { + arriveAtEnd = false; + } + } + if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable(); } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { mPrevAPStatus = state; + + if (FunctionBuildConfig.isDemoMode + && FunctionBuildConfig.appIdentityMode == 1) { + // 当美化模式(演示模式)开启时:且是乘客app、且未到终点时,维持自动驾驶icon开启状态 + if (!arriveAtEnd) { + return; + } else { + arriveAtEnd = false; + } + } + if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable(); } } @@ -961,6 +985,11 @@ public class MogoOCHTaxiModelNew { @Override public void onAutopilotArriveAtStation(@Nullable AutopilotStationInfo data) { + if (FunctionBuildConfig.isDemoMode + && FunctionBuildConfig.appIdentityMode == 1) { + arriveAtEnd = true; + } + if (data == null || !checkCurrentOCHOrder() || (getCurOrderStatus() == OrderStatusEnum.ArriveAtEndStation)) { return;