Merge remote-tracking branch 'origin/dev_robotaxi-d_241202_6.8.2' into dev_robobus-d_241202_6.8.4

# Conflicts:
#	OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt
#	OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt
#	OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt
#	gradle.properties

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt

@@ -355,6 +355,12 @@ object CallerAutoPilotControlManager {
         }
     }
 
+    fun setFusionColor(isEnable: Boolean){
+        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+            providerApi?.setFusionColor(isEnable)
+        }
+    }
+
     /**
      * 是否忽略条件直接绘制
      * 司机屏同步给乘客屏

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import com.alibaba.android.arouter.launcher.ARouter
+import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean
 import com.mogo.eagle.core.data.biz.notice.NoticeNormalData
 import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStylePushData
@@ -50,7 +51,8 @@ object CallerHmiManager {
         listenerIMoGo: IMoGoWarningStatusListener? = null,
         direction: WarningDirectionEnum = ALERT_WARNING_NON,
         expireTime: Long = 5000L,
-        isFromObu: Boolean,
+        newLevel: Int = AIAssist.LEVEL2,
+        isFromObu :Boolean = false
     ) {
         hmiProviderApi?.warningV2X(
             v2xType,
@@ -59,6 +61,7 @@ object CallerHmiManager {
             listenerIMoGo,
             direction,
             expireTime,
+            newLevel,
             isFromObu
         )
     }

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicListenerManager.kt

@@ -57,4 +57,21 @@ object CallerTelematicListenerManager: CallerBase<IReceivedMsgListener>() {
             }
         }
     }
+
+    fun dispatchFusionColor(fusionColor: Boolean) {
+        if (fusionColor != FunctionBuildConfig.isFusionColor) {
+            FunctionBuildConfig.isFusionColor = fusionColor
+            M_LISTENERS.forEach {
+                val listener = it.value
+                try {
+                    listener.onFusionColor(fusionColor)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                    Log.e(TAG, "转发感知颜色出现异常：${e.message}")
+                }
+            }
+        }
+    }
+
+
 }