[dev_opt_2.15.0] 合并dev_arch_opt_3.0分支并解决冲突

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt

@@ -626,6 +626,9 @@ class MoGoAdasListenerImpl : OnAdasListener {
         header: MessagePad.Header?,
         bagManager: BagManagerOuterClass.BagManager?
     ) {
+        bagManager?.let {
+            CallerAutopilotRecordListenerManager.invokeBagManagerResult(it)
+        }
     }
 
     /**

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt

@@ -109,7 +109,6 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
     override fun onCurrentVersion(version: MogoObuSystemBConfigData) {
         CallerLogger.d("$M_OBU${MogoObuConst.TAG_UPGRADE_OBU}", "onCurrentVersion version = ${version.version}")
         if (!version.version.isNullOrEmpty()) {
-            CallerObuInfoListenerManager.invokeObuVersionName(version.version)
             CallerDevaToolsManager.queryObuUpgrade(version.version)
         }
     }
@@ -194,6 +193,15 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
             }
         }
 
+        /**
+         * OBU 系统状态
+         *
+         * @param data 系统状态
+         */
+        override fun onObuSystemStatus(data: MogoObuSystemStatusData?) {
+            CallerObuInfoListenerManager.invokeGetObuInfo(data.toString())
+        }
+
         /**
          * HV车辆基础信息 gnssInfo
          */

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/adapter/MoGoObuListenerImpl.kt

@@ -31,6 +31,15 @@ object MoGoObuListenerImpl : OnObuListener {
         CallerObuConnectListenerManager.invokeObuConnectListener()
     }
 
+    /**
+     * OBU 系统状态
+     *
+     * @param data 系统状态
+     */
+    override fun onObuSystemStatus(data: MogoObuSystemStatusData?) {
+
+    }
+
 
     /**
      * HV车辆基础信息