Merge branch 'dev_robotaxi-d_250709_8.1.4' into dev_robotaxi-d_250709_8.1.2_advideo

# Conflicts:
#	gradle.properties
This commit is contained in:
yangyakun
2025-07-17 16:29:27 +08:00
18 changed files with 263 additions and 58 deletions

View File

@@ -7,6 +7,7 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxType
import com.mogo.eagle.core.data.deva.report.ReportEntity
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
import com.mogo.eagle.core.function.call.devatools.CallerCollisionRiskManager
import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
import com.mogo.eagle.core.utilcode.util.TimeUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
@@ -84,6 +85,11 @@ class IPCReportManager : IMoGoAutopilotStatusListener {
*/
override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
guardianInfo?.let{
//8.1.4版本异常声光电提醒
if(it.code == MogoReport.Code.Info.IMAP.CONTROLLER_START_FM_COMMAND){
CallerCollisionRiskManager.invokeCollisionRisk()
}
if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE)
|| it.resultList.contains(RESULT_AUTOPILOT_SYSTEM_UNSTARTED)
|| it.resultList.contains(RESULT_REMOTEPILOT_DISABLE)
@@ -96,7 +102,7 @@ class IPCReportManager : IMoGoAutopilotStatusListener {
|| it.code == MogoReport.Code.Info.IMAP.EXIT_AUTOPILOT
|| it.code == MogoReport.Code.Info.IMAP.ENTRY_REMOTEPILOT
|| it.code == MogoReport.Code.Info.IMAP.EXIT_REMOTEPILOT
|| it.code == MogoReport.Code.Info.IMAP.CONTROLLER_START_FM_COMMAND
// || it.code == MogoReport.Code.Info.IMAP.CONTROLLER_START_FM_COMMAND
|| it.code == MogoReport.Code.Info.IMAP.CONTROLLER_FINISH_FM_COMMAND
|| it.code == MogoReport.Code.Info.IMAP.CONTROLLER_ABORT_FM_COMMAND
|| it.code == MogoReport.Code.Info.IMAP.PLANNING_START_FM_COMMAND