Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0

# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt

@@ -114,6 +114,11 @@ interface IDevaToolsProvider : IProvider {
      */
     fun updateUpgradeProgress()
 
+    /**
+     * obu下载进度
+     */
+    fun updateObuUpgradeStatus()
+
     /**
      * 展示状态栏
      */

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuStatusListener.kt

@@ -1,7 +1,7 @@
 package com.mogo.eagle.core.function.api.obu
 
-import com.mogo.eagle.core.data.obu.ObuStatusInfo
 import com.mogo.eagle.core.data.traffic.TrafficData
+import mogo.telematics.pad.MessagePad
 
 /**
  * @author xiaoyuzhou
@@ -17,6 +17,13 @@ interface IMoGoObuStatusListener {
 
     }
 
+    /**
+     * obu Tracker data
+     */
+    fun updateTrackerFusionData(trackObject: MessagePad.TrackedObject?){
+
+    }
+
     /**
      * 更新obu Tracker 预警信息
      */