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

[Routing]

Browse Source 
1、对接后台的pointType //20240523， 判断此点是中间站点还是途径点 ------- true：站点， false：简单的途径点
This commit is contained in:
donghongyu
2024-08-27 11:10:19 +08:00
parent 581a7c4d78
commit 7aa5f9f6e1
3 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt
View File

@@ -26,7 +26,8 @@ data class RoutingSite(
var gcjLat: Double,// 高德坐标
var gcjLon: Double,// 高德坐标
var wgs84Lon: Double,//高精坐标
var wgs84Lat: Double//高精坐标
var wgs84Lat: Double,//高精坐标
var pointType: Int // 1:途径点 2:禁行点 3:站点
)
/**

40
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt
View File

@@ -19,10 +19,10 @@ import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.eagle.core.utilcode.util.NetworkUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation
import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation
import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager.writeChainLog
@@ -592,7 +592,24 @@ object TaxiRoutingModel {
wayLatLons.add(
AutopilotControlParameters.AutoPilotLonLat(
mogoLatLng.wgs84Lat,
mogoLatLng.wgs84Lon
mogoLatLng.wgs84Lon,
when (mogoLatLng.pointType) {
1 -> {//途径点
false
}
2 -> {//禁行点
false
}
3 -> {//站点
true
}
else -> {
false
}
}
)
)
}
@@ -604,7 +621,24 @@ object TaxiRoutingModel {
blackLatLons.add(
AutopilotControlParameters.AutoPilotLonLat(
mogoLatLng.wgs84Lat,
mogoLatLng.wgs84Lon
mogoLatLng.wgs84Lon,
when (mogoLatLng.pointType) {
1 -> {//途径点
false
}
2 -> {//禁行点
false
}
3 -> {//站点
true
}
else -> {
false
}
}
)
)
}

11
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt
View File

@@ -61,6 +61,9 @@ fun AutopilotControlParameters.toRouteInfo(): MessagePad.RouteInfo {
routeInfo.startLocation = startLoc.build()
routeInfo.endLocation = endLoc.build()
//20240523 用于表示判断是否是站点下单。默认false：起点下单，接管下单； true: 中间站点下单
//routeInfo.isStation = false
val line = MessagePad.Line.newBuilder()
this.autoPilotLine?.let {
line.lineId = it.lineId
@@ -204,6 +207,7 @@ class AutopilotControlParameters {
class AutoPilotLonLat {
var lat = 0.0
var lon = 0.0
var isStation = false //20240523， 判断此点是中间站点还是途径点 ------- true：站点， false：简单的途径点
constructor() {}
constructor(lat: Double, lon: Double) {
@@ -211,10 +215,17 @@ class AutopilotControlParameters {
this.lon = lon
}
constructor(lat: Double, lon: Double,isStation:Boolean) {
this.lat = lat
this.lon = lon
this.isStation = isStation
}
override fun toString(): String {
return "AutoPilotLonLat{" +
"lat=" + lat +
", lon=" + lon +
", isStation=" + isStation +
'}'
}
}