Merge branch 'master' into 'release_robotaxi-d-app-module_2110_220915_2.11.0.1'

# Conflicts:
#   app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#   core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
This commit is contained in:
pangfan
2022-10-31 03:08:24 +00:00
255 changed files with 10443 additions and 8 deletions

View File

@@ -1,6 +1,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.config.FunctionBuildConfig
import com.mogo.eagle.core.data.constants.MogoServicePaths
@@ -346,4 +347,11 @@ object CallerAutoPilotManager {
fun sendStatusQueryReq() {
providerApi?.sendStatusQueryReq()
}
/**
* 福田清扫车业务指令下发
*/
fun sendSweeperFuTianTaskCmd(fuTianTaskCmd: SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd) {
providerApi?.sendSweeperFuTianTaskCmd(fuTianTaskCmd)
}
}

View File

@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.call.autopilot
import androidx.annotation.Nullable
import chassis.Chassis
import chassis.VehicleStateOuterClass
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener
import com.mogo.eagle.core.function.call.base.CallerBase
import mogo.telematics.pad.MessagePad
@@ -132,6 +133,16 @@ object CallerAutopilotVehicleStateListenerManager : CallerBase() {
}
}
/**
* clean system state 清扫车(福田)清扫控制系统状态
*/
fun invokeSweeperFutianCleanSystemState(cleanSystemState: VehicleStateOuterClass.SweeperFuTianCleanSystemState){
M_AUTOPILOT_VEHICLE_LISTENERS.forEach{
val listener = it.value
listener.onSweeperFutianCleanSystemState(cleanSystemState)
}
}
/**
* 工控机时间回调