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

Merge branch 'dev_robotaxi-d_241112_6.8.1_dev' into dev_robotaxi-d_241210_6.9.0

Browse Source
This commit is contained in:
xuxinchao
2024-12-10 19:49:58 +08:00
parent 3bcf5da8cc 393f9fb978
commit 1ce31e2032
40 changed files with 1498 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ import com.zhjt.mogo.adas.data.sweeper.task.s_r.SweeperTaskSuspendResume.Suspend
import com.zhjt.mogo.adas.data.sweeper.task.stop.SweeperTaskStop.StopTaskResp
import mogo.telematics.pad.MessagePad
import mogo.yycp.paralleldriving.protocol.ParallelDrivingRequest
import system_master.SsmInfo
/**
* @author xiaoyuzhou
@@ -712,4 +713,28 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
*/
fun sendSimulationWireFailure(isTrigger: Boolean): Boolean
/**
* SSM发送OTA升级提示请求响应
*
* @param token 域控发送OTA升级请求中的Token {@link SsmInfo.OtaDownloadRequest#getOtaToken()}
* @param ifUpgrade {@link SsmInfo.IfUpgrade#IMMEDIATELY}：立即
* {@link SsmInfo.IfUpgrade#DELAY}：推迟
*/
fun sendSsmFuncOtaDownloadResponse(token: String,ifUpgrade: SsmInfo.IfUpgrade): Boolean
/**
* 查询OTA状态
*
* @param token 域控发送OTA升级请求中的Token {@link SsmInfo.OtaDownloadRequest#getOtaToken()}
* 如果没有可以传null或""
*/
fun sendSsmFuncOtaStatusQuery(token: String): Boolean
/**
* 人工接管时获取前方和后方摄像头数据
* 一次请求域控回调次两次摄像头数据 根据{@link MessagePad.CaptureImgOnTakeOver#getUuid()}进行区分是否是哪次请求
* 例如下发uuid = 1 域控正常会回调两次响应接口 两次的uuid都是1，通过isFront区分是前方还是后方摄像头
* 域控响应接口{@link OnAdasListener#onCaptureImgOnTakeOver(MessagePad.Header, boolean, MessagePad.CaptureImgOnTakeOver)}
*/
fun sendCaptureImgReqOnTakeOver(uuid: Long): Boolean
}

17
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/ICaptureImgListener.kt Normal file
View File

@@ -0,0 +1,17 @@
package com.mogo.eagle.core.function.api.devatools
import mogo.telematics.pad.MessagePad
/**
* 接管时前方和后方摄像头数据请求响应回调
*/
interface ICaptureImgListener {
/**
* 接管时前方和后方摄像头数据请求的响应
* @param isFront true：前方摄像头 false：后方摄像头
* @param data 数据
*/
fun onCaptureImgOnTakeOver(isFront: Boolean, data: MessagePad.CaptureImgOnTakeOver){}
}

31
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IOTAListener.kt Normal file
View File

@@ -0,0 +1,31 @@
package com.mogo.eagle.core.function.api.devatools
import system_master.SsmInfo
/**
* OTA升级接口
*/
interface IOTAListener {
/**
* SSM发送OTA升级提示请求
* @param request SSM发送OTA升级提示内容
*/
fun onOtaDownloadRequest(request: SsmInfo.OtaDownloadRequest){}
// /**
// * SSM上报OTA下载进度, 开始升级后定频上报
// * @param progress 下载进度
// */
// fun onOtaLoadingProgress(progress: SsmInfo.OtaLoadingProgess){}
/**
* SSM上报OTA状态和查询OTA状态
* 冷启动状态变更上报以及查询状态
* 如果是查询到的结果，{@link SsmInfo.OtaStatus#getOtaInfo()}
* 中的{@link SsmInfo.OtaDownloadRequest#getOtaToken()}==""表示不存在升级任务
* @param status 冷启动状态变更上报以及查询状态
*/
fun onOtaStatus(status: SsmInfo.OtaStatus){}
}

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

@@ -7,6 +7,7 @@ import com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBea
import com.mogo.eagle.core.data.biz.notice.NoticeNormalData
import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStylePushData
import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
import com.mogo.eagle.core.data.deva.ota.OtaUpgradeInfo
import com.mogo.eagle.core.data.enums.WarningDirectionEnum
import com.mogo.eagle.core.data.map.Infrastructure
import com.mogo.eagle.core.function.api.hmi.xiaozhi.event.Event
@@ -322,4 +323,20 @@ interface IMoGoHmiProvider :IProvider{
* 展示冷启动进度条
*/
fun showColdStartProcessView()
/**
* 展示OTA升级弹窗
*/
fun showOTAUpgradeDialog()
/**
* 展示OTA升级下载状态弹窗
*/
fun showOTADownloadStatusDialog(list: List<OtaUpgradeInfo>)
/**
* 展示OTA升级提示
* @param visible 设置是否可见
*/
fun showOTAUpgradeTipView(visible: Boolean)
}