Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display

# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
#	foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java

@@ -433,7 +433,6 @@ public class BusOrderModel {
                     clearAutopilotControlParameters();
                     closeBeautificationMode();
                     clearStartAutopilotTag();
-                    removeTipRunnables();
                     return;
                 }
                 CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据: " + data);
@@ -517,6 +516,7 @@ public class BusOrderModel {
                             endOrAbortTaskSuccess();
                             clearBusStationDatas();
                             queryBusRoutes();
+                            removeTipRunnables();
  //                           startOrStopQueryPassengerWriteOff(false);
                         }
                     }
@@ -794,6 +794,8 @@ public class BusOrderModel {
                 beforeTaskTips();
             }
 //            startOrStopQueryPassengerWriteOff(true);
+        }else {
+            removeTipRunnables();
         }
 
         BusStationBean currentStation = stationList.get(backgroundCurrentStationIndex);
@@ -961,6 +963,7 @@ public class BusOrderModel {
                             endOrAbortTaskSuccess();
                             clearBusStationDatas();
                             queryBusRoutes();// 重新获取任务
+                            removeTipRunnables();
 //                            startOrStopQueryPassengerWriteOff(false);
                             VoiceNotice.showNotice(mContext.getString(R.string.bus_end_task_tip));
                         }