diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt index 82430b304a..bc1247acc1 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt @@ -40,7 +40,10 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 { fun initServer(context: Context) { mContext = context - MogoApisHandler.getInstance().apis.registerCenterApi.registerCarLocationChangedListener(TAG, this) + MogoApisHandler.getInstance().apis.registerCenterApi.registerCarLocationChangedListener( + TAG, + this + ) Logger.d(TAG, "ready to start mThreadHandler") mThreadHandler = TrafficLightThreadHandler(WorkThreadHandler.newInstance("TrafficLight").looper, @@ -52,12 +55,18 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 { it.longitude, it.latitude ) - trafficLightNetWorkModel.requestRoadID(tileId, it.latitude, it.longitude, { - mThreadHandler!!.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_CROSS_ROAD) - roadId = it - }, { - Logger.d(TAG, "request road id error : $it") - }) + trafficLightNetWorkModel.requestRoadID( + tileId, + it.latitude, + it.longitude, + it.bearing.toDouble(), + { + mThreadHandler!!.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_CROSS_ROAD) + roadId = it + }, + { + Logger.d(TAG, "request road id error : $it") + }) } }, { //stop loop search road id 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 cd184a6bea..d00e67ef45 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 @@ -21,13 +21,14 @@ class TrafficLightNetWorkModel { tileID: Long, lat: Double, lon: Double, + bearing: Double, onSuccess: ((String) -> Unit), onError: ((String) -> Unit), ) { request>("requestRoadID") { val map = hashMapOf() start { - val roadIDRequestData = RoadIDRequestData(tileID, lat, lon) + val roadIDRequestData = RoadIDRequestData(tileID, lat, lon, bearing) map["sn"] = MoGoAiCloudClientConfig.getInstance().sn map["data"] = Gson().toJson(roadIDRequestData) } @@ -37,10 +38,10 @@ class TrafficLightNetWorkModel { } } onSuccess { - if(it.result!= null){ + if (it.result != null) { onSuccess.invoke(it.result.rSCrossId) - }else{ - onSuccess.invoke("11078") + } else { + onError.invoke("requestRoadID result is null : ${it.result}") } } onError { @@ -100,7 +101,7 @@ class TrafficLightNetWorkModel { request> { val map = hashMapOf() start { - val trafficLightRequestData = ChangeLightRequestData(lightId,crossingNo,heading) + val trafficLightRequestData = ChangeLightRequestData(lightId, crossingNo, heading) map["sn"] = MoGoAiCloudClientConfig.getInstance().sn map["data"] = Gson().toJson(trafficLightRequestData) } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadIDRequestData.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadIDRequestData.kt index 7d5ea6ab9d..10b675214e 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadIDRequestData.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadIDRequestData.kt @@ -1,5 +1,5 @@ package com.mogo.eagle.core.data.trafficlight //获取路口ID请求数据 -class RoadIDRequestData(val tileId: Long, val lat: Double, val lon: Double) { +class RoadIDRequestData(val tileId: Long, val lat: Double, val lon: Double, val bearing: Double) { } \ No newline at end of file