yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release_robotaxi-d-app-module_2120_221017_2.12.0.1'

Browse Source 
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
This commit is contained in:
pangfan
2022-11-15 11:23:39 +08:00
parent a676ea93c9 10a9e7e3b1
commit 2b38bf67c0
287 changed files with 8616 additions and 3625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
View File

@@ -89,6 +89,17 @@ interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider {
*/
fun recordPackage(type: Int,id: Int,duration: Int,bduration: Int): Boolean
/**
* 开启域控制器录制bag包
* @param type 录制类型 1: badcase 2:map 3:rests
* @param id 指令/任务 ID
* @param duration 录制时长
* @param bduration 录制前溯时长
* @param topics 录制Topic集合
* @return true-成功,false-失败
*/
fun recordPackage(type: Int,id: Int,duration: Int,bduration: Int,topics: List<String>): Boolean
/**
* Log 是否显示
*
@@ -153,9 +164,28 @@ interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider {
fun setRainMode(isEnable: Boolean)
/**
* 获取数据采集录制模式配置列表
* 绕障类功能开关
* isEnable = true 开启
* isEnable = false 关闭
* @return boolean
*/
fun getBadCaseConfig()
fun sendDetouring(isEnable: Boolean): Boolean
/**
* 变道绕障的目标障碍物速度阈值
* @param speed 速度阈值 m/s
* @return boolean
*/
fun sendDetouringSpeed(speed: Double): Boolean
/**
* 获取数据采集录制模式配置列表
* @param reqType 0: all, 1:获取当前所有topic列表, 2:配置需要预加载的topic组合
* @param recordType 0:不需要修改内置类型的topic组合, 1:需要修改内置类型的topic组合
* @param topicsNeedToCache
* @return boolean
*/
fun getBadCaseConfig(reqType: Int,recordType: Int,topicsNeedToCache: List<String>): Boolean
/**
* 发送工控机所有节点重启命令
@@ -234,6 +264,21 @@ interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider {
*/
fun sendOperatorSetHorn(value: Double)
/**
* 发生行程相关
* type=1或2的时 需要参数 lineName
* type=3或4的时 需要参数 lineName departureStopName arrivalStopName isLastStop
* type=5时 不需要任何参数
*
* @param type 事件类型, 1:行程开始, 2:行程结束, 3:出站, 4:进站, 5:城市占道施工预警
* @param lineName 路线名
* @param departureStopName 出站站点名
* @param arrivalStopName 下一站到达站点名
* @param isLastStop 是否最终站
* @return boolean
*/
fun sendTripInfo(type: Int, lineName: String, departureStopName: String,arrivalStopName: String, isLastStop: Boolean)
/**
* 福田清扫车业务指令下发
*/

16
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatisticsListener.kt Normal file
View File

@@ -0,0 +1,16 @@
package com.mogo.eagle.core.function.api.autopilot
import com.zhidao.support.adas.high.bean.AutopilotStatistics
interface IMoGoAutopilotStatisticsListener {
/**
* 启动自动驾驶状态统计
* 触发机制：下发启动自动驾驶命令，根据MAP返回状态判断成功或失败
* 统计四种状态：成功 失败 取消 超时
*
* @param statistics 统计数据
*/
fun onAutopilotStatistics(statistics: AutopilotStatistics?)
}

2
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt
View File

@@ -66,6 +66,6 @@ interface IMoGoAutopilotStatusListener {
/**
* 平行驾驶
*/
const val STATUS_PARALLEL_DRIVING = 3
const val STATUS_PARALLEL_DRIVING = 7
}
}

18
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoStartAutopilotFailedListener.kt Normal file
View File

@@ -0,0 +1,18 @@
package com.mogo.eagle.core.function.api.autopilot
import com.zhidao.support.adas.high.bean.AutopilotAbility
import mogo_msg.MogoReportMsg
interface IMoGoStartAutopilotFailedListener {
/**
* 启动自动驾驶失败回调
* 根据MAP 系统监控状态返回过滤
* message.getMsg() 获取详细错误说明
* message.getCode() 可用于判断属于什么类型
*
* @param message 数据
*/
fun onStartAutopilotFailed(message: MogoReportMsg.MogoReportMessage?)
}

7
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IMoGoDevaToolsFuncConfigListener.kt
View File

@@ -12,5 +12,10 @@ interface IMoGoDevaToolsFuncConfigListener {
* lock : 锁定状态
* data : json
*/
fun updateBizData(type: String, state: Boolean, lock: Boolean, data: String?)
fun updateBizData(type: String, state: Boolean, lock: Boolean, data: String?) {}
/**
* 更新业务锁定状态,仅限View使用
*/
fun updateBizView(type: String,lock: Boolean){}
}

17
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
View File

@@ -1,6 +1,7 @@
package com.mogo.eagle.core.function.api.hmi.warning
import android.view.View
import android.view.ViewGroup
import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
import com.mogo.eagle.core.data.enums.WarningDirectionEnum
import com.mogo.eagle.core.data.map.Infrastructure
@@ -68,6 +69,11 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy {
*/
fun toggleDebugView()
/**
* 开关SOPSettingView
*/
fun toggleSOPView()
/**
* 展示VR下V2X预警
*
@@ -258,4 +264,15 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy {
fun showVideoDialog(infList: List<Infrastructure>)
fun setBusOperationView(view:IOchBusView)
/**
* 设置状态栏暗夜或明亮模式
* 默认 light
*/
fun setStatusBarDarkOrLight(light: Boolean)
/**
* 更新(添加/删除)状态栏右侧元素
*/
fun updateStatusBarRightView(insert: Boolean, tag: String, viewGroup: ViewGroup)
}

3
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.kt
View File

@@ -11,4 +11,7 @@ interface IMoGoObuProvider : IMoGoFunctionServerProvider {
fun connect(ipAddress: String)
fun disConnect()
fun isConnected(): Boolean
}