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/fragment/BaseSweeperTabFragment.java
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
This commit is contained in:
bxb
2023-03-01 09:35:07 +08:00
207 changed files with 4556 additions and 1509 deletions

View File

@@ -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
}
}
/**
* 向左变道
*/

View File

@@ -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)
}
}
}

View File

@@ -141,6 +141,13 @@ object CallerDevaToolsManager {
devaToolsProviderApi?.showFeedbackWindow(ctx)
}
/**
* 展示录包管理页面
*/
fun showBadCaseManagerView(context: Context){
devaToolsProviderApi?.showBadCaseManagerView(context)
}
/**
* 下载指定包
*/
@@ -237,4 +244,8 @@ object CallerDevaToolsManager {
}
fun apmEnvProvider(): IApmEnvProvider? = devaToolsProviderApi?.apmEnvProvider()
fun queryObuUpgrade(obuVersionName: String) {
devaToolsProviderApi?.queryObuUpgrade(obuVersionName)
}
}

View File

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

View File

@@ -20,13 +20,6 @@ object CallerObuWarningListenerManager : CallerBase<IMoGoObuStatusListener>() {
}
}
fun invokeTrackerFusionData(trackObject: MessagePad.TrackedObject?){
M_LISTENERS.forEach {
val listener = it.value
listener.updateTrackerFusionData(trackObject)
}
}
fun invokeTrackerWarningInfo(trafficData: TrafficData) {
M_LISTENERS.forEach {
val listener = it.value