diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ad82747b49..22d04a33fd 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/server/AsyncDataToAutopilotServer.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/server/AsyncDataToAutopilotServer.kt index 85119fd3ea..24aa7c7ad1 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/server/AsyncDataToAutopilotServer.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/server/AsyncDataToAutopilotServer.kt @@ -1,9 +1,12 @@ package com.mogo.eagle.core.function.autopilot.server +import com.mogo.eagle.core.data.autopilot.AutopilotControlCmdParameter import com.mogo.eagle.core.data.trafficlight.TrafficLightResult import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.util.GsonUtils /** * @author xiaoyuzhou @@ -27,7 +30,7 @@ class AsyncDataToAutopilotServer private constructor() : IMoGoTrafficLightListen } override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) { - // TODO 这里替换成与克难沟通的JSON格式 @钟超 -// CallerAutoPilotManager.sendDataToAutopilot() + val autopilotControlCmdParameter = AutopilotControlCmdParameter("light", trafficLightResult) + CallerAutoPilotManager.sendDataToAutopilot(GsonUtils.toJson(autopilotControlCmdParameter)) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt index aabdac0ea3..cd184a6bea 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt @@ -38,7 +38,7 @@ class TrafficLightNetWorkModel { } onSuccess { if(it.result!= null){ - onSuccess.invoke(it.result.crossId) + onSuccess.invoke(it.result.rSCrossId) }else{ onSuccess.invoke("11078") } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadIDResult.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadIDResult.kt index 1066b628cb..9d85272dcb 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadIDResult.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadIDResult.kt @@ -2,13 +2,13 @@ package com.mogo.eagle.core.data.trafficlight //车辆行驶前方100米范围内的 路口ID 查询结果 /** - * RSCrossId : RS系统对应路口id + * rSCrossId : RS系统对应路口id * crossId : ai云路口id * distance : 当前车道需驶入到距离终点距离 * baseLaneInfoList : 驶入路口需要经过路段 */ class RoadIDResult( - val RSCrossId: String, + val rSCrossId: String, val crossId: String, val distance: Double, val baseLaneInfoList: BaseLaneInfoList