diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index 4f7ff6105a..d990a5e4be 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -7,6 +7,7 @@ import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HdMapBuildConfig import com.mogo.eagle.core.data.deva.chain.ChainConstant +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_ABILITY import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_ARRIVE import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_GUARDIAN import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_RECORD @@ -327,7 +328,7 @@ class MoGoAdasListenerImpl : OnAdasListener { //todo 新增稳定设备类型需要添加,目的避免在nuc设备上使用此类功能 private val limit = DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model() override fun onPointCloud(header: MessagePad.Header, pointCloud: ByteArray?) { - if(limit){ + if (limit) { //点云数据透传 CallerAutopilotPointCloudListenerManager.invokeAutopilotPointCloudDataUpdate(pointCloud) } @@ -572,8 +573,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param taskInfo 数据 */ - override fun onSweeperFutianCloudTask(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, taskInfo: SweeperTask.TaskInfo?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTask(messageType, reqNo, sysTime, taskInfo) + override fun onSweeperFutianCloudTask( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + taskInfo: SweeperTask.TaskInfo? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTask( + messageType, + reqNo, + sysTime, + taskInfo + ) } /** @@ -585,8 +597,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param taskConfirm 数据 */ - override fun onSweeperFutianCloudTaskConfirm(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, taskConfirm: SweeperTaskConfirm.TaskConfirm?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskConfirm(messageType, reqNo, sysTime, taskConfirm) + override fun onSweeperFutianCloudTaskConfirm( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + taskConfirm: SweeperTaskConfirm.TaskConfirm? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskConfirm( + messageType, + reqNo, + sysTime, + taskConfirm + ) } /** @@ -598,8 +621,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param taskStatusPush 数据 */ - override fun onSweeperFutianCloudTaskStatus(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, taskStatusPush: SweeperTaskStatus.TaskStatusPush?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskStatus(messageType, reqNo, sysTime, taskStatusPush) + override fun onSweeperFutianCloudTaskStatus( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + taskStatusPush: SweeperTaskStatus.TaskStatusPush? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskStatus( + messageType, + reqNo, + sysTime, + taskStatusPush + ) } /** @@ -611,8 +645,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param stopTaskReq 数据 */ - override fun onSweeperFutianCloudTaskStop(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, stopTaskReq: SweeperTaskStop.StopTaskReq?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskStop(messageType, reqNo, sysTime, stopTaskReq) + override fun onSweeperFutianCloudTaskStop( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + stopTaskReq: SweeperTaskStop.StopTaskReq? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskStop( + messageType, + reqNo, + sysTime, + stopTaskReq + ) } /** @@ -625,8 +670,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param suspendResumeTaskResp 数据 */ - override fun onSweeperFutianCloudTaskSuspendResume(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, suspendResumeTaskResp: SweeperTaskSuspendResume.SuspendResumeTaskResp?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskSuspendResume(messageType, reqNo, sysTime, suspendResumeTaskResp) + override fun onSweeperFutianCloudTaskSuspendResume( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + suspendResumeTaskResp: SweeperTaskSuspendResume.SuspendResumeTaskResp? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskSuspendResume( + messageType, + reqNo, + sysTime, + suspendResumeTaskResp + ) } /** @@ -638,8 +694,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param isBootableResp 数据 */ - override fun onSweeperFutianCloudBootable(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, isBootableResp: SweeperBootable.IsBootableResp?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudBootable(messageType, reqNo, sysTime, isBootableResp) + override fun onSweeperFutianCloudBootable( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + isBootableResp: SweeperBootable.IsBootableResp? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudBootable( + messageType, + reqNo, + sysTime, + isBootableResp + ) } /** @@ -651,8 +718,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param bigTaskStatusPush 数据 */ - override fun onSweeperFutianCloudBigTaskStatus(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, bigTaskStatusPush: SweeperBigTaskStatus.BigTaskStatusPush?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudBigTaskStatus(messageType, reqNo, sysTime, bigTaskStatusPush) + override fun onSweeperFutianCloudBigTaskStatus( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + bigTaskStatusPush: SweeperBigTaskStatus.BigTaskStatusPush? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudBigTaskStatus( + messageType, + reqNo, + sysTime, + bigTaskStatusPush + ) } /** @@ -739,7 +817,11 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param getParamResp 配置参数 * @param adasParam 解析后的配置参数 */ - override fun onGetParamResp(header: MessagePad.Header, getParamResp: MessagePad.SetParamReq, adasParam: AdasParam) { + override fun onGetParamResp( + header: MessagePad.Header, + getParamResp: MessagePad.SetParamReq, + adasParam: AdasParam + ) { CallerAutopilotGetParamResponseDispatcher.dispatchResponse(header, getParamResp, adasParam) } @@ -761,10 +843,26 @@ class MoGoAdasListenerImpl : OnAdasListener { * 是否可以启动自动驾驶 * 使用方法查看:app_ipc_monitoring/uiMainActivity/onAutopilotAbility */ - override fun onAutopilotAbility(isAutopilotAbility: Boolean, unableAutopilotReasons: ArrayList?) { + override fun onAutopilotAbility( + isAutopilotAbility: Boolean, + unableAutopilotReasons: ArrayList? + ) { + if (unableAutopilotReasons != null && unableAutopilotReasons.size > 0) { + autopilotAbilityCheck(isAutopilotAbility, unableAutopilotReasons.toString()) + } invokeAutopilotAbility(isAutopilotAbility, unableAutopilotReasons) } + @ChainLog( + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_ABILITY, + paramIndexes = [0, 1] + ) + private fun autopilotAbilityCheck(isAutopilotAbility: Boolean, reason: String) { + + } + /** * 启动自动驾驶失败回调 * 根据MAP 系统监控状态返回过滤 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt index c98482f3d9..79c8ecba8e 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt @@ -54,6 +54,7 @@ class ChainConstant { const val CHAIN_CODE_ADAS_CAR_CONFIG = "CHAIN_CODE_ADAS_CAR_CONFIG" const val CHAIN_CODE_ADAS_RECT_DATA = "CHAIN_CODE_ADAS_RECT_DATA" const val CHAIN_CODE_ADAS_CAR_LOC = "CHAIN_CODE_ADAS_CAR_LOC" + const val CHAIN_CODE_ADAS_ABILITY = "CHAIN_CODE_ADAS_ABILITY" const val CHAIN_CODE_ADAS_STATUS = "CHAIN_CODE_ADAS_STATUS" const val CHAIN_CODE_ADAS_SEND = "CHAIN_CODE_ADAS_SEND" const val CHAIN_CODE_ADAS_ARRIVE = "CHAIN_CODE_ADAS_ARRIVE"