Merge branch 'dev_robotaxi-d_250417_8.0.0_routing' into dev_robotaxi-d_250709_8.2.0_advideo

# Conflicts:
#	OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/MusicModel.kt
#	OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt

foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/IMogoStatusManager.java

@@ -110,6 +110,16 @@ public interface IMogoStatusManager extends IProvider {
      */
     void setSeekHelping( String tag, boolean seekHelping );
 
+    /**
+     * 小巴、接驳、包车 是否在执行任务中
+     *
+     * @param tag
+     * @param isPerformingTask
+     */
+    void setShuttleDriverPerformTask( String tag, boolean isPerformingTask );
+
+    boolean isShuttleDriverPerformTask();
+
     /**
      * taxi无人化司机端 是否在执行任务中
      *

foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/MogoStatusManager.java

@@ -117,6 +117,16 @@ public class MogoStatusManager implements IMogoStatusManager {
         doSetStatus(tag, StatusDescriptor.SEEK_HELPING, seekHelping);
     }
 
+    @Override
+    public void setShuttleDriverPerformTask(String tag, boolean isPerformingTask) {
+        doSetStatus(tag, StatusDescriptor.Shuttle_DRIVER_PERFORM_TASK, isPerformingTask);
+    }
+
+    @Override
+    public boolean isShuttleDriverPerformTask() {
+        return get_bool_val(StatusDescriptor.Shuttle_DRIVER_PERFORM_TASK);
+    }
+
     @Override
     public void setTaxiUnmanedDriverPerformTask(String tag, boolean isPerformingTask) {
         doSetStatus(tag, StatusDescriptor.TAXI_UNMANED_DRIVER_PERFORM_TASK, isPerformingTask);

foudations/mogo-commons/src/main/java/com/mogo/commons/module/status/StatusDescriptor.java

@@ -48,6 +48,12 @@ public enum StatusDescriptor {
      */
     SCREEN_COVER,
 
+    /**
+     * 小巴、接驳、班车 是否执行任务中
+     */
+    Shuttle_DRIVER_PERFORM_TASK,
+
+
     /**
      * taxi无人化 是否执行任务中
      */