diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index 6d6be9bf00..bc4002a800 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -157,6 +157,7 @@ public class BusPassengerModel {
                                 || data.getResult() == null
                                 || data.getResult().getSites() == null) {
                             routesResult = null;
+                            startOrStopCalculateRouteInfo(false);
                             if (mRouteLineInfoCallback != null){
                                 mRouteLineInfoCallback.showNoTaskView();
                             }
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
index a2a710c9dd..ace5357382 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
@@ -147,17 +147,6 @@ public class BusPresenter extends Presenter<BusFragment>
         runOnUIThread(() -> mView.clearBusStationsMarkers());
     }
 
-    private void functionDemoModeChange() {
-//        CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel ="," functionDemoModeChange ="+mCurrentStation);
-        if (FunctionBuildConfig.isDemoMode
-                && ((mCurrentStation > 0 && mCurrentStation < mStationList.size() - 1)
-                        || ((mCurrentStation == 0 || mCurrentStation == mStationList.size() - 1)
-                                && BusOrderModel.getInstance().isGoingToNextStation()))) {
-            runOnUIThread(() -> mView.onAutopilotStatusChanged(
-                    IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING));
-        }
-    }
-
     @Override
     public void hideSlidePanel() {
         if (mView != null) {
@@ -193,11 +182,8 @@ public class BusPresenter extends Presenter<BusFragment>
 //                    }
                     if (FunctionBuildConfig.isDemoMode
                             && (
-                            (mCurrentStation > 0 && mCurrentStation < mStationList.size() - 1)
-                                    || (
-                                    (mCurrentStation == 0 || mCurrentStation == mStationList.size() - 1)
-                                            && BusOrderModel.getInstance().isGoingToNextStation()
-                            )
+                            (mCurrentStation >= 0 && mCurrentStation <= mStationList.size() - 1)
+                                    && BusOrderModel.getInstance().isGoingToNextStation()
                     )
                     ) {
                         CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能");
@@ -224,11 +210,9 @@ public class BusPresenter extends Presenter<BusFragment>
                     currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE;
                     if (FunctionBuildConfig.isDemoMode
                             && (
-                            (mCurrentStation > 0 && mCurrentStation < mStationList.size() - 1)
-                                    || (
-                                    (mCurrentStation == 0 || mCurrentStation == mStationList.size() - 1)
-                                            && BusOrderModel.getInstance().isGoingToNextStation()
-                            )
+                            (mCurrentStation >= 0 && mCurrentStation <= mStationList.size() - 1)
+                                    && BusOrderModel.getInstance().isGoingToNextStation()
+
                     )
                     ) {
                         CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能");