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,5 +1,6 @@
package com.mogo.eagle.core.function.api.autopilot
import chassis.SpecialVehicleTaskCmdOuterClass
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
@@ -232,4 +233,9 @@ interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider {
* 鸣笛 开始1结束2
*/
fun sendOperatorSetHorn(value: Double)
/**
* 福田清扫车业务指令下发
*/
fun sendSweeperFuTianTaskCmd(fuTianTaskCmd: SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd)
}

View File

@@ -1,7 +1,7 @@
package com.mogo.eagle.core.function.api.autopilot
import chassis.Chassis
import mogo.telematics.pad.MessagePad
import chassis.VehicleStateOuterClass
/**
* 车辆底盘 数据 回调监听
@@ -52,4 +52,9 @@ interface IMoGoAutopilotVehicleStateListener {
* 刹车
*/
fun onAutopilotBrake(brake: Float)
/**
* 清扫车(福田)清扫控制系统状态
*/
fun onSweeperFutianCleanSystemState(cleanSystemState: VehicleStateOuterClass.SweeperFuTianCleanSystemState)
}