Merge branch 'dev_robotaxi-d_250603_8.1.0' into dev_robotaxi-d_250417_8.0.0_routing

# Conflicts:
#	OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningModel.kt
#	OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt
#	OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt
This commit is contained in:
yangyakun
2025-06-27 15:22:56 +08:00
915 changed files with 57732 additions and 2664 deletions

View File

@@ -1154,4 +1154,55 @@ object CallerAutoPilotControlManager {
fun sendCloudConfigRequest(): Boolean{
return providerApi?.sendCloudConfigRequest()?:false
}
/**
* NDE下行感知进PNC开关
* @param enable 0: 不发给PnC 1:发给Pnc
*/
fun sendNdeDownPerceptionToPnc(enable: Int): Boolean{
return providerApi?.sendNdeDownPerceptionToPnc(enable)?:false
}
/**
* NDE下行事件进PNC开关
* @param enable 0: 不发给PnC 1:发给Pnc
*/
fun sendNdeDownEventToPnc(enable: Int): Boolean{
return providerApi?.sendNdeDownEventToPnc(enable)?:false
}
/**
* V2I下行感知进PNC开关
* @param enable 0: 不发给PnC 1:发给Pnc
*/
fun sendV2iDownPerceptionToPnc(enable: Int): Boolean{
return providerApi?.sendV2iDownPerceptionToPnc(enable)?:false
}
/**
* 云端配置控制
* @param type 0:蘑菇云 1:NDE云 2:基础平台云
* @param direction 0:上行和下行 1:上行 2:下行 当 type == 0 或 1 时 此值只能是 0蘑菇云和NDE云只能上下行同时控制当 type == 2 时 此值不能是 0基础平台云只能上下行分开控制
* @param enable 连接使能开关, true:开 false:关闭
*/
fun sendForceStopOrStartCloudReq(type: Int,direction: Int,enable: Boolean): Boolean{
return providerApi?. sendForceStopOrStartCloudReq(type, direction, enable)?:false
}
/**
* 域控上报OBU开关控制
* @param enable 0:关 1:开
*/
fun sendSetObuUploadReq(enable: Int): Boolean{
return providerApi?.sendSetObuUploadReq(enable)?:false
}
/**
* 域控上报OBU开关状态查询
*/
fun sendObuUploadStatusQuery(): Boolean{
return providerApi?.sendObuUploadStatusQuery()?:false
}
}

View File

@@ -73,4 +73,18 @@ object CallerAutopilotIdentifyListenerManager : CallerBase<IMoGoAutopilotIdentif
listener.onPredictionProbabilityChanged(pro1, pro2)
}
}
fun invokeScreenPointsChanged(data: FloatArray, index: Int = 1) {
M_LISTENERS.forEach {
val listener = it.value
listener.screenPointsChanged(data, index)
}
}
fun invokePreScrPointsChanged(data: FloatArray, index: Int = 0) {
M_LISTENERS.forEach {
val listener = it.value
listener.preScrPointsChanged(data, index)
}
}
}

View File

@@ -25,6 +25,14 @@ object CallerFaultManagementStateListenerManager : CallerBase<IMoGoFaultManageme
private var tempHighAction: Int = 9 //临时故障Level
fun invokeFaultManagementState(fmInfo: FmInfo.FaultResultMsg) {
M_LISTENERS.forEach {
val listener = it.value
try {
listener.onFaultManagementState(fmInfo)
} catch (t: Throwable) {
t.printStackTrace()
}
}
val policyCode = fmInfo.downgradePolicyCode
if (policyCode == null || policyCode.isEmpty()) {
return

View File

@@ -0,0 +1,26 @@
package com.mogo.eagle.core.function.call.autopilot
import com.mogo.eagle.core.function.api.autopilot.IVlmListener
import com.mogo.eagle.core.function.call.base.CallerBase
import vllm.Vlm
/**
* 视觉语言模型
*/
object CallerVlmManager : CallerBase<IVlmListener>() {
fun invokeVllm(sourceTimestamp: Double, vllm: Vlm.VLLMObject) {
M_LISTENERS.forEach {
val listener = it.value
listener.onVllm(sourceTimestamp, vllm)
}
}
fun invokeVllmImage(sourceTimestamp: Double, image: ByteArray) {
M_LISTENERS.forEach {
val listener = it.value
listener.onVllmImage(sourceTimestamp, image)
}
}
}

View File

@@ -1,21 +0,0 @@
package com.mogo.eagle.core.function.call.devatools
import com.mogo.eagle.core.function.api.devatools.IImgUploadCloudListener
import com.mogo.eagle.core.function.call.base.CallerBase
import mogo.telematics.pad.MessagePad
/**
* 域控摄像头上传NDE云开关状态回调管理
*/
object CallerImgUploadCloudManager: CallerBase<IImgUploadCloudListener>() {
/**
* 查询摄像头上传NDE云状态返回
*/
fun invokeImgUploadCloudStatusResp(resp: MessagePad.ImgUploadCloudStatusResp){
M_LISTENERS.forEach{
val listener = it.value
listener.onImgUploadCloudStatusResp(resp)
}
}
}

View File

@@ -0,0 +1,100 @@
package com.mogo.eagle.core.function.call.devatools
import com.mogo.eagle.core.function.api.devatools.INDECloudListener
import com.mogo.eagle.core.function.call.base.CallerBase
import com.zhjt.mogo.adas.data.bean.cloud.info.AdviceAvwInfo
import com.zhjt.mogo.adas.data.bean.cloud.info.AdviceComRsiInfo
import com.zhjt.mogo.adas.data.bean.cloud.info.AdviceEvwInfo
import com.zhjt.mogo.adas.data.bean.cloud.info.AdviceGlosaInfo
import com.zhjt.mogo.adas.data.bean.cloud.info.AdviceLaneSpdLmtInfo
import com.zhjt.mogo.adas.data.bean.cloud.info.AstFuncTlmInfo
import com.zhjt.mogo.adas.data.bean.cloud.pojo.AdvicePojo
import com.zhjt.mogo.adas.data.bean.cloud.pojo.AstFuncPojo
/**
* 云控基础平台
*/
object CallerNDECloudManager: CallerBase<INDECloudListener>() {
/**
* NDE下发 信号灯信息
* @param astFuncPojo 云端辅助功能信息
* @param astFuncTlmInfo 云端下发信号灯信息
*/
fun onNdeCloudAstFuncTlm(astFuncPojo: AstFuncPojo, astFuncTlmInfo: AstFuncTlmInfo){
M_LISTENERS.forEach{
val listener = it.value
listener.onNdeCloudAstFuncTlm(astFuncPojo,astFuncTlmInfo)
}
}
/**
* NDE下发 信号灯路口车速引导功能指令
* @param advicePojo 实时决策建议
* @param adviceGlosaInfo 信号灯路口车速引导功能指令
*/
fun onNdeCloudAdviceGlosa(advicePojo: AdvicePojo, adviceGlosaInfo: AdviceGlosaInfo) {
M_LISTENERS.forEach{
val listener = it.value
listener.onNdeCloudAdviceGlosa(advicePojo,adviceGlosaInfo)
}
}
/**
* NDE下发 通用 RSI 预警指令
* 包含:
* 闯红灯预警
* 行驶车道建议
* 交通拥堵提醒
* 道路危险状况提示
* 超视距弱势交通参与者提醒
* 路口其他车辆闯红灯预警
* 障碍物(路面遗撒)预警
* 能见度预警
* @param advicePojo 实时决策建议
* @param adviceComRsiInfo 通用RSI预警指令
*/
fun onNdeCloudAdviceComRsi(advicePojo: AdvicePojo, adviceComRsiInfo: AdviceComRsiInfo) {
M_LISTENERS.forEach{
val listener = it.value
listener.onNdeCloudAdviceComRsi(advicePojo,adviceComRsiInfo)
}
}
/**
* NDE下发 紧急车辆预警指令
* @param advicePojo 实时决策建议
* @param adviceEvwInfo 紧急车辆预警指令
*/
fun onNdeCloudAdviceEvw(advicePojo: AdvicePojo, adviceEvwInfo: AdviceEvwInfo) {
M_LISTENERS.forEach{
val listener = it.value
listener.onNdeCloudAdviceEvw(advicePojo,adviceEvwInfo)
}
}
/**
* NDE下发 动态车道级限速指令
* @param advicePojo 实时决策建议
* @param adviceLaneSpdLmtInfo 动态车道级限速指令
*/
fun onNdeCloudAdviceLaneSpdLmt(advicePojo: AdvicePojo, adviceLaneSpdLmtInfo: AdviceLaneSpdLmtInfo) {
M_LISTENERS.forEach{
val listener = it.value
listener.onNdeCloudAdviceLaneSpdLmt(advicePojo,adviceLaneSpdLmtInfo)
}
}
/**
* NDE下发 异常车辆预警指令
* @param advicePojo 实时决策建议
* @param adviceAvwInfo 异常车辆预警指令
*/
fun onNdeCloudAdviceAvw(advicePojo: AdvicePojo, adviceAvwInfo: AdviceAvwInfo) {
M_LISTENERS.forEach{
val listener = it.value
listener.onNdeCloudAdviceAvw(advicePojo,adviceAvwInfo)
}
}
}

View File

@@ -0,0 +1,58 @@
package com.mogo.eagle.core.function.call.devatools
import com.mogo.eagle.core.function.api.devatools.IV2XListener
import com.mogo.eagle.core.function.call.base.CallerBase
import com.zhjt.mogo.adas.data.bean.AdasParam
import mogo.telematics.pad.MessagePad
/**
* 域控摄像头上传NDE云开关状态回调管理
*/
object CallerV2XManager: CallerBase<IV2XListener>() {
/**
* 云端配置查询响应
* @param config 数据
*/
fun invokeCloudConfig(config: MessagePad.CloudConfig){
M_LISTENERS.forEach{
val listener = it.value
listener.onCloudConfig(config)
}
}
/**
* 查询摄像头上传NDE云状态返回
*/
fun invokeImgUploadCloudStatusResp(resp: MessagePad.ImgUploadCloudStatusResp){
M_LISTENERS.forEach{
val listener = it.value
listener.onImgUploadCloudStatusResp(resp)
}
}
/**
* 查询 NDE下行事件数据进pnc 与 V2I下行感知数据进pnc 与 NDE下行感知数据进pnc参数获取应答
* @param getParamResp 配置参数
* @param adasParam 解析后的配置参数
*/
fun invokeGetParamResp(getParamResp: MessagePad.SetParamReq,adasParam: AdasParam){
M_LISTENERS.forEach{
val listener = it.value
listener.onGetParamResp(getParamResp, adasParam)
}
}
/**
* 域控上报OBU开关状态响应
* @param enable 数据
*/
fun invokeObuUploadStatus(enable: MessagePad.SetEnableReq){
M_LISTENERS.forEach{
val listener = it.value
listener.onObuUploadStatus(enable)
}
}
}

View File

@@ -483,8 +483,8 @@ object CallerHmiManager {
/**
* 展示OTA升级弹窗
*/
fun showOTAUpgradeDialog(isShow: Boolean){
hmiProviderApi?.showOTAUpgradeDialog(isShow)
fun showOTAUpgradeDialog(isShow: Boolean,content: String){
hmiProviderApi?.showOTAUpgradeDialog(isShow,content)
}
/**
@@ -497,10 +497,18 @@ object CallerHmiManager {
/**
* 展示OTA升级结果弹窗
* @param isShow 是否展示
* @param result true升级成功 false升级失败
*/
fun showOTAResultDialog(result: Boolean){
hmiProviderApi?.showOTAResultDialog(result)
fun showOTAResultDialog(isShow: Boolean,result: Boolean){
hmiProviderApi?.showOTAResultDialog(isShow,result)
}
/**
* OTA升级完成且优雅停服完成、需要车辆下电的时候车端告知鹰眼司机屏弹窗提示用车人执行车辆下电操作
*/
fun showOTAPowerOffFinishDialog(){
hmiProviderApi?.showOTAPowerOffFinishDialog()
}
/**

View File

@@ -106,6 +106,21 @@ object CallerTrafficLightListenerManager : CallerBase<IMoGoTrafficLightListener>
}
}
/**
* 云控基础平台红绿灯信号
* @param currentState 当前灯态
* @param currentDuration 当前灯态倒计时
* @param nextState 下一灯态
* @param nextDuration 下一灯态倒计时
*/
fun showCloudTrafficLight(currentState: TrafficLightEnum,currentDuration: Int,
nextState: TrafficLightEnum, nextDuration: Int){
M_LISTENERS.forEach{
val listener = it.value
listener.showCloudTrafficLight(currentState, currentDuration, nextState, nextDuration)
}
}
fun changeCountdownTrafficLightNum(redNum: Int, yellowNum: Int, greenNum: Int) {
M_LISTENERS.forEach {
val listener = it.value