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-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt

@@ -164,6 +164,12 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
      */
     fun setDemoMode(isEnable: Boolean)
 
+    /**
+     * 融合颜色
+     * 司机屏同步给乘客屏
+     */
+    fun setFusionColor(isEnable: Boolean)
+
     /**
      * 是否忽略条件直接绘制
      * 司机屏同步给乘客屏

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

@@ -25,7 +25,7 @@ interface IMoGoHmiProvider :IProvider{
     /**
      * 不展示顶部弹窗，其它保留
      */
-    fun warningV2X(v2xType: String, alertContent: CharSequence?, ttsContent: String?, listener: IMoGoWarningStatusListener?, direction: WarningDirectionEnum, expireTime: Long, isFromObu: Boolean)
+    fun warningV2X(v2xType: String, alertContent: CharSequence?, ttsContent: String?, listener: IMoGoWarningStatusListener?, direction: WarningDirectionEnum, expireTime: Long, newLevel: Int, isFromObu:Boolean)
 
     /**
      * 展示指定方位上的红框预警

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/telematic/IReceivedMsgListener.kt

@@ -1,9 +1,11 @@
 package com.mogo.eagle.core.function.api.telematic
 
 interface IReceivedMsgListener {
-    fun onReceivedMsg(type: Int, byteArray: ByteArray)
+    fun onReceivedMsg(type: Int, byteArray: ByteArray){}
 
     fun onReceivedServerSn(sn: String?) {}
 
     fun onDemoMode(isDemoMode: Boolean) {}
+
+    fun onFusionColor(fusionColor: Boolean){}
 }