Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0

# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	core/mogo-core-function-call/build.gradle

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

@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.call.autopilot
 import android.os.SystemClock
 import chassis.SpecialVehicleTaskCmdOuterClass
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
+import com.mogo.eagle.core.data.badcase.BagManagerEntity
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig
@@ -268,6 +269,19 @@ object CallerAutoPilotControlManager {
         }
     }
 
+    /**
+     * 获取Bag包管理信息
+     * @param bagManagerEntity 包管理请求实体类
+     */
+    fun sendBagManagerCmd(bagManagerEntity: BagManagerEntity): Boolean?{
+        // 司机屏才能查询数据采集的配置
+        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
+            return providerApi?.sendBagManagerCmd(bagManagerEntity)
+        }else{
+            return false
+        }
+    }
+
     /**
      * 向左变道
      */

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

@@ -1,5 +1,6 @@
 package com.mogo.eagle.core.function.call.autopilot
 
+import bag_manager.BagManagerOuterClass
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import mogo.telematics.pad.MessagePad
@@ -34,4 +35,15 @@ object CallerAutopilotRecordListenerManager : CallerBase<IMoGoAutopilotRecordLis
         }
     }
 
+    /**
+     * 录包任务管理应答
+     */
+    fun invokeBagManagerResult(bagManager: BagManagerOuterClass.BagManager){
+        M_LISTENERS.forEach{
+            val tag = it.key
+            val listener = it.value
+            listener.onBagManagerResult(bagManager)
+        }
+    }
+
 }

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt

@@ -13,6 +13,7 @@ import com.mogo.eagle.core.data.deva.scene.SceneModule
 import com.mogo.eagle.core.data.deva.scene.SceneTAG
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider
+import com.mogo.eagle.core.function.api.devatools.apm.*
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 
@@ -234,4 +235,10 @@ object CallerDevaToolsManager {
     fun queryAppUpgrade(){
         devaToolsProviderApi?.queryAppUpgrade()
     }
+
+    fun apmEnvProvider(): IApmEnvProvider? = devaToolsProviderApi?.apmEnvProvider()
+
+    fun queryObuUpgrade(obuVersionName: String) {
+        devaToolsProviderApi?.queryObuUpgrade(obuVersionName)
+    }
 }

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuApiManager.kt

@@ -47,4 +47,18 @@ object CallerObuApiManager {
         providerApi.setObuLog(isSet)
     }
 
+    /**
+     * 升级obu硬件
+     */
+    fun uploadObuPack(filePathArray: Array<String>) {
+        providerApi.uploadObuPack(filePathArray)
+    }
+
+    /**
+     * 删除obu文件夹
+     */
+    fun deleteObuFile() {
+        providerApi.deleteObuFile()
+    }
+
 }