diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt
index d297d147dc..9594084458 100644
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt
@@ -1,6 +1,7 @@
 package com.magic.mogo.och.charter.view.autopilot
 
 import androidx.lifecycle.ViewModel
+import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse.Result.Companion.ARRIVING
 import com.magic.mogo.och.charter.callback.IDriverM1ControllerStatusCallback
 import com.magic.mogo.och.charter.constant.CharterConst
 import com.magic.mogo.och.charter.model.DriverM1Model
@@ -14,6 +15,8 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.common.module.manager.beautifymode.BeautifyManager
 import com.mogo.och.common.module.manager.beautifymode.IBeautifyModeCallback
+import com.mogo.och.common.module.manager.stopsidemanager.StopSideManager
+import com.mogo.och.common.module.manager.stopsidemanager.StopSideStatus
 import com.mogo.och.common.module.utils.RxUtils
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -116,40 +119,28 @@ class AutopilotStatusViewModel: ViewModel(), IDriverM1ControllerStatusCallback,
     fun setUIMode(state:Int){
         if (FunctionBuildConfig.isDemoMode) {// 美化模式
             viewCallback?.inAutopilot()
-//            when (CharterPassengerModel.getCurrentOrderStatus()) {
-//                OrderStatusEnum.Nothing -> {// 初始状态
-//                    //是否强制绘制引导线
-//                    FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false
-//                }
-//                OrderStatusEnum.NoOrderUnuse -> {//无订单车闲置
-//                    //是否强制绘制引导线
-//                    FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false
-//                }
-//                OrderStatusEnum.OrderNoLine -> {//有订单无线路
-//                    //是否强制绘制引导线
-//                    FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false
-//                }
-//                OrderStatusEnum.OrdersWithLine -> {//有订单有线路  是否到站
-//                    //是否强制绘制引导线
-//                    CharterPassengerModel.getCurrentOrderInfo()?.let {
-//                        if(it.arriveStatus == OrderInfoResponse.ARRIVED){
-//                            // 到站不绘制引导线
-//                            FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false
-//                            return
-//                        }
-//                        if (StopSideManager.stopSiteStatus== StopSideStatus.EndingSuccess) {
-//                            // 靠边停车成功不绘制引导线
-//                            FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false
-//                            return
-//                        }
-//                        FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true
-//                    }
-//                }
-//                OrderStatusEnum.NoOrderUse -> {// 无订单车不闲置
-//                    //是否强制绘制引导线
-//                    FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false
-//                }
-//            }
+            val busOrderResult = DriverM1Model.get().getBusOrderResult()
+            if(busOrderResult==null){//无订单车闲置|车辆不闲置
+                //是否强制绘制引导线
+                FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false
+            }else{
+                if(busOrderResult.lineId==0||busOrderResult.siteId==0){//有订单无线路
+                    //是否强制绘制引导线
+                    FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false
+                }else{
+                    if (busOrderResult.arriveStatus==ARRIVING) {
+                        // 到站不绘制引导线
+                        FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false
+                        return
+                    }
+                    if (StopSideManager.stopSiteStatus== StopSideStatus.EndingSuccess) {
+                        // 靠边停车成功不绘制引导线
+                        FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false
+                        return
+                    }
+                    FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true
+                }
+            }
         }else{
             when (state) {
                 IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {