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
2025-06-27 15:22:56 +08:00
parent 0808b1ddeb 443f1cafe1
commit 319b42f228
915 changed files with 57732 additions and 2664 deletions
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt
@@ -774,4 +774,41 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
     */
    fun sendCloudConfigRequest(): Boolean

+    /**
+     * NDE下行感知进PNC开关
+     * @param enable 0: 不发给PnC 1:发给Pnc
+     */
+    fun sendNdeDownPerceptionToPnc(enable: Int): Boolean
+
+    /**
+     * NDE下行事件进PNC开关
+     * @param enable 0: 不发给PnC 1:发给Pnc
+     */
+    fun sendNdeDownEventToPnc(enable: Int): Boolean
+
+    /**
+     * V2I下行感知进PNC开关
+     * @param enable 0: 不发给PnC 1:发给Pnc
+     */
+    fun sendV2iDownPerceptionToPnc(enable: Int): Boolean
+
+    /**
+     * 云端配置控制
+     * @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
+
+    /**
+     * 域控上报OBU开关控制
+     * @param enable 0:关 1:开
+     */
+    fun sendSetObuUploadReq(enable: Int): Boolean
+
+    /**
+     * 域控上报OBU开关状态查询
+     */
+    fun sendObuUploadStatusQuery(): Boolean
+
 }
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotIdentifyListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotIdentifyListener.kt
@@ -61,4 +61,8 @@ interface IMoGoAutopilotIdentifyListener {
    fun onAutopilotV2nCongestionEvent(header: MessagePad.Header, rsi: MogoV2X.RSI_PB) {}

    fun onPredictionProbabilityChanged(pro1: Float, pro2: Float) {}
+
+    fun screenPointsChanged(data: FloatArray, index: Int = 1) {}
+
+    fun preScrPointsChanged(data: FloatArray, index: Int = 0) {}
 }
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IVlmListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IVlmListener.kt
@@ -0,0 +1,27 @@
+package com.mogo.eagle.core.function.api.autopilot
+
+
+import vllm.Vlm
+
+/**
+ * 视觉语言模型
+ */
+interface IVlmListener {
+
+
+    /**
+     * 视觉语言模型数据
+     *
+     * @param sourceTimestamp 数据源时间戳 vlm数据与vlm图像的数据源时间戳完全一致则表示为同一条数据
+     * @param vllm   数据
+     */
+    fun onVllm(sourceTimestamp: Double, vllm: Vlm.VLLMObject)
+
+    /**
+     * 视觉语言模型图像
+     *
+     * @param sourceTimestamp 数据源时间戳 vlm数据与vlm图像的数据源时间戳完全一致则表示为同一条数据
+     * @param image  数据
+     */
+    fun onVllmImage(sourceTimestamp: Double, image: ByteArray)
+}
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTrafficLightListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTrafficLightListener.kt
@@ -88,6 +88,16 @@ interface IMoGoTrafficLightListener {
                               nextTwoState: TrafficLightEnum, nextTwoDuration: Int,
                               lightSource: DataSourceType){}

+    /**
+     * 云控基础平台红绿灯
+     * @param currentState 当前灯态
+     * @param currentDuration 当前灯态倒计时
+     * @param nextState 下一灯态
+     * @param nextDuration 下一灯态倒计时
+     */
+    fun showCloudTrafficLight(currentState: TrafficLightEnum, currentDuration: Int,
+                              nextState: TrafficLightEnum, nextDuration: Int){}
+
    /**
     * @param redNum 红灯倒计时
     * @param yellowNum 黄灯倒计时
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IImgUploadCloudListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IImgUploadCloudListener.kt
@@ -1,15 +0,0 @@
-package com.mogo.eagle.core.function.api.devatools
-
-import mogo.telematics.pad.MessagePad
-
-/**
- * 域控摄像头上传NDE云开关状态回调
- */
-interface IImgUploadCloudListener {
-
-    /**
-     * 查询状态回调
-     */
-    fun onImgUploadCloudStatusResp(resp: MessagePad.ImgUploadCloudStatusResp)
-
-}
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/INDECloudListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/INDECloudListener.kt
@@ -0,0 +1,68 @@
+package com.mogo.eagle.core.function.api.devatools
+
+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
+
+/**
+ * 云控基础平台接口
+ */
+interface INDECloudListener {
+
+    /**
+     * NDE下发 信号灯信息
+     * @param astFuncPojo    云端辅助功能信息
+     * @param astFuncTlmInfo 云端下发信号灯信息
+     */
+    fun onNdeCloudAstFuncTlm(astFuncPojo: AstFuncPojo, astFuncTlmInfo: AstFuncTlmInfo){}
+
+    /**
+     * NDE下发 信号灯路口车速引导功能指令
+     * @param advicePojo      实时决策建议
+     * @param adviceGlosaInfo 信号灯路口车速引导功能指令
+     */
+    fun onNdeCloudAdviceGlosa(advicePojo: AdvicePojo, adviceGlosaInfo: AdviceGlosaInfo){}
+
+    /**
+     * NDE下发 通用 RSI 预警指令
+     * 包含：
+     * 闯红灯预警
+     * 行驶车道建议
+     * 交通拥堵提醒
+     * 道路危险状况提示
+     * 超视距弱势交通参与者提醒
+     * 路口其他车辆闯红灯预警
+     * 障碍物(路面遗撒)预警
+     * 能见度预警
+     * @param advicePojo       实时决策建议
+     * @param adviceComRsiInfo 通用RSI预警指令
+     */
+    fun onNdeCloudAdviceComRsi(advicePojo: AdvicePojo, adviceComRsiInfo: AdviceComRsiInfo){}
+
+    /**
+     * NDE下发 紧急车辆预警指令
+     * @param advicePojo    实时决策建议
+     * @param adviceEvwInfo 紧急车辆预警指令
+     */
+    fun onNdeCloudAdviceEvw(advicePojo: AdvicePojo, adviceEvwInfo: AdviceEvwInfo){}
+
+    /**
+     * NDE下发 动态车道级限速指令
+     * @param advicePojo           实时决策建议
+     * @param adviceLaneSpdLmtInfo 动态车道级限速指令
+     */
+    fun onNdeCloudAdviceLaneSpdLmt(advicePojo: AdvicePojo, adviceLaneSpdLmtInfo: AdviceLaneSpdLmtInfo){}
+
+    /**
+     * NDE下发 异常车辆预警指令
+     * @param advicePojo    实时决策建议
+     * @param adviceAvwInfo 异常车辆预警指令
+     */
+    fun onNdeCloudAdviceAvw(advicePojo: AdvicePojo, adviceAvwInfo: AdviceAvwInfo){}
+
+}
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IV2XListener.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IV2XListener.kt
@@ -0,0 +1,36 @@
+package com.mogo.eagle.core.function.api.devatools
+
+import com.zhjt.mogo.adas.data.bean.AdasParam
+import mogo.telematics.pad.MessagePad
+
+/**
+ * 域控摄像头上传NDE云开关状态回调
+ */
+interface IV2XListener {
+
+    /**
+     * 云端配置查询响应
+     * @param config 数据
+     */
+    fun onCloudConfig(config: MessagePad.CloudConfig)
+
+    /**
+     * 摄像头上传NDE云状态响应
+     * @param resp 数据
+     */
+    fun onImgUploadCloudStatusResp(resp: MessagePad.ImgUploadCloudStatusResp)
+
+    /**
+     * 查询 NDE下行事件数据进pnc 与 V2I下行感知数据进pnc 与 NDE下行感知数据进pnc参数获取应答
+     * @param getParamResp 配置参数
+     * @param adasParam    解析后的配置参数
+     */
+    fun onGetParamResp(getParamResp: MessagePad.SetParamReq,adasParam: AdasParam)
+
+    /**
+     * 域控上报OBU开关状态响应
+     * @param enable 数据
+     */
+    fun onObuUploadStatus(enable: MessagePad.SetEnableReq)
+
+}
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt
@@ -334,7 +334,7 @@ interface IMoGoHmiProvider :IProvider{
     * 展示OTA升级弹窗
     *  @param isShow 设置是否展示
     */
-    fun showOTAUpgradeDialog(isShow: Boolean)
+    fun showOTAUpgradeDialog(isShow: Boolean,content: String)

    /**
     * 展示OTA升级下载状态弹窗
@@ -343,9 +343,15 @@ interface IMoGoHmiProvider :IProvider{

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

    /**
     * 展示数据落盘拷贝成功对话框