Merge branch 'release_robobus-d_230413_3.1.0.1'

# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
#	core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
#	gradle.properties

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt

@@ -29,12 +29,28 @@ interface IMoGoFuncBizProvider : IMoGoFunctionServerProvider {
      */
     fun dispatchAffirm()
 
+    /**
+     * 停止调度确认
+     */
+    fun stopDispatchAffirm()
+
     /**
      * 调度取消
      * @param manualTrigger 是否手动
      */
     fun dispatchCancel(manualTrigger: Boolean)
 
+    /**
+     * 停止调度取消
+     * @param manualTrigger 是否手动
+     */
+    fun stopDispatchCancel(manualTrigger: Boolean)
+
+    /**
+     * 调度重启自驾确认
+     */
+    fun restartDispatchAffirm()
+
     /**
      * 调度测试
      */

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt

@@ -107,6 +107,11 @@ interface IMoGoHmiProvider :IProvider{
      */
     fun dismissDispatchDialog()
 
+    /**
+     * 调度重启自驾弹窗展示
+     */
+    fun showDispatchRestartDialog(msgData: DispatchAdasAutoPilotLocReceiverBean)
+
     /**
      * 设置状态栏暗夜或明亮模式
      * 默认 light