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

Merge remote-tracking branch 'origin/dev_MogoAP_eagle-1030_211020_8.0.14' into dev_MogoAP_eagle-1030_211020_8.0.14

Browse Source
This commit is contained in:
donghongyu
2021-11-11 17:53:33 +08:00
parent cd14017753 16d9a7bd05
commit 7823ac00ce
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
View File

@@ -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

11
core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt
View File

@@ -21,13 +21,14 @@ class TrafficLightNetWorkModel {
tileID: Long,
lat: Double,
lon: Double,
bearing: Double,
onSuccess: ((String) -> Unit),
onError: ((String) -> Unit),
) {
request<BaseResponse<RoadIDResult>>("requestRoadID") {
val map = hashMapOf<String, String>()
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<BaseResponse<Any>> {
val map = hashMapOf<String, String>()
start {
val trafficLightRequestData = ChangeLightRequestData(lightId,crossingNo,heading)
val trafficLightRequestData = ChangeLightRequestData(lightId, crossingNo, heading)
map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
map["data"] = Gson().toJson(trafficLightRequestData)
}

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadIDRequestData.kt
View File

@@ -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) {
}