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

# Conflicts:
#	core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java
This commit is contained in:
yangyakun
2023-02-21 16:28:51 +08:00
34 changed files with 797 additions and 315 deletions

View File

@@ -290,4 +290,26 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
* @param isDrawPointCloud 是否绘制点云
*/
fun setIsDrawPointCloud(isDrawPointCloud: Boolean)
fun sendRoboBusJinlvM1FrontDoorCmd(switchCmd: Int): Boolean
fun sendRoboBusJinlvM1AirConditionerCmd(
switchCmd: Int,
modeCmd: Int,
windSpeedCmd: Int,
temperatureCmd: Int
): Boolean
fun sendRoboBusJinlvM1HeaderCmd(switchCmd: Int, windSpeedCmd: Int): Boolean
fun sendRoboBusJinlvM1MainLamp1Cmd(switchCmd: Int): Boolean
fun sendRoboBusJinlvM1MainLamp2Cmd(switchCmd: Int): Boolean
/**
* 车门控制
*/
fun sendRoboBusJinlvM1SmallLampCmd(switchCmd: Int): Boolean
fun sendRoboBusJinlvM1TaskCmd(roboBusJinlvM1Cmd: SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd): Boolean
}

View File

@@ -3,12 +3,12 @@ package com.mogo.eagle.core.function.api.autopilot
import chassis.Chassis
/**
* 车辆挂档位 数据 回调监听
* 车辆挂档位 数据 回调监听
*/
interface IMoGoChassisGearStateListener {
/**
* 车辆挂档位
* 车辆挂档位
* @param gear 档位
*/
fun onAutopilotGearData(gear: Chassis.GearPosition)

View File

@@ -1,5 +1,7 @@
package com.mogo.eagle.core.function.api.obu
import com.mogo.eagle.core.data.enums.DataSourceType
/**
* OBU 数据保存
* @author lixiaopeng
@@ -11,8 +13,8 @@ interface IMoGoObuSaveMessageListener {
* @param type 事件id类似与uuid
* @param content 事件内容
* @param tts 事件语音播报
*
* @param sourceType 来源
*/
fun onMoGoObuSaveMessage(type: String, content: String, tts: String)
fun onMoGoObuSaveMessage(type: String, content: String, tts: String, sourceType: DataSourceType)
}