diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java index bb99b9c96c..ad92e2fc57 100644 --- a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java @@ -647,6 +647,10 @@ public class OrderModel { */ private void startAutopilot(boolean isRestart, int leaveIndex) { + + // 非自驾状态---->预写日志----> 启动自驾 ---> 自驾启动成功 ----> 上报日志 + //  自驾状态---->启动自驾 ---> 自驾启动成功 + //根据开关和后台是否发布轨迹启动自驾 if (FunctionBuildConfig.isPassStartAutopilotCommand && TextUtils.isEmpty(busRoutesResult.csvFileUrl) && TextUtils.isEmpty(busRoutesResult.csvFileUrlDPQP)){ @@ -661,12 +665,6 @@ public class OrderModel { CallerLogger.INSTANCE.e(M_BUS + TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand); - if(CallerAutoPilotStatusListenerManager.INSTANCE.getState() - == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ - ToastUtils.showShort("自驾中、请勿重复启动"); - return; - } - if (!FunctionBuildConfig.isDemoMode && !OCHAdasAbilityManager.getInstance().getAutopilotAbilityStatus()) { ToastUtils.showLong(OCHAdasAbilityManager.getInstance().getAutopilotUnAbilityReason() + @@ -677,7 +675,10 @@ public class OrderModel { firstStartAutopilot++; - triggerStartServiceEvent(isRestart, false); + if(CallerAutoPilotStatusListenerManager.INSTANCE.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ + // 预写日志 + triggerStartServiceEvent(isRestart, false); + } AutopilotControlParameters parameters = initAutopilotControlParameters(leaveIndex); if (null == parameters) {