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 d18442ea0f..b651855d3f 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
@@ -787,13 +787,17 @@ public class TaxiModel {
         TaxiTrajectoryManager.getInstance().syncTrajectoryInfo();
         SharedPrefsMgr.getInstance(mContext).putString(TaxiConst.SP_KEY_OCH_TAXI_ORDER,
                 GsonUtil.jsonFromObject(data));
-        if (FunctionBuildConfig.isDemoMode
-                && mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) {
-            // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
-            FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
-            CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(true);
-            CallerAutoPilotManager.INSTANCE.setIPCDemoMode(true);
-            CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）");
+        if (FunctionBuildConfig.isDemoMode) {
+            if (mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()){
+                // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
+                FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
+                CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(true);
+                CallerAutoPilotManager.INSTANCE.setIPCDemoMode(true);
+                CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）");
+            }
+            if (mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.getCode()){
+                CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
+            }
         }
     }
 
@@ -1165,8 +1169,9 @@ public class TaxiModel {
 
             if (FunctionBuildConfig.isDemoMode) {
                 // 当美化模式（演示模式）开启时: 到达目的地，置false
-                FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
-                CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(false);
+                // 2022.10.08 到达目的地时候取消自动起自驾， 服务完成取消引导线和自动驾驶按钮状态
+//                FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
+//                CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(false);
                 CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
                 CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（到达目的地）");
             }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java
index 5c209c7b87..1d99bce35c 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java
@@ -425,7 +425,7 @@ public class TaxiServiceManager {
                         ,orderNo,loc))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(getSubscribeImpl(context, callback, "arriveTerminal"));
+                .subscribe(getSubscribeImpl(context, callback, "orderCompleted"));
 
     }