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

[Routing]

Browse Source 
1、增加黑名单点的支持，需要运营平台上线相应功能
This commit is contained in:
donghongyu-pc
2024-08-15 19:02:37 +08:00
parent 10756e0e5b
commit cd6fef7e7c
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,13 +14,7 @@ data class GrayLineBean(
var lineFailCount: Int?, //线路累计反馈不可用次数 var lineFailCount: Int?, //线路累计反馈不可用次数
var isChoosed: Boolean = false, //当前是否选中 var isChoosed: Boolean = false, //当前是否选中
var startSite: RoutingSite?, var startSite: RoutingSite?,
var endSite: RoutingSite?, var endSite: RoutingSite?
var hdMapDBVersionCode: String?,// Routing 运营平台通过算路引擎算这条路时候使用的对应高精地图版本号
var hdMapDBVersionName: String?,// Routing 运营平台通过算路引擎算这条路时候使用的对应高精地图版本名
var routingEnginVersionCode: String?,// Routing 运营平台当前的算路引擎版本号码
var routingEnginVersionName: String?,// Routing 运营平台当前的算路引擎版本名称
var wayPoints: MutableList<RoutingSite>?,// Routing 给算路引擎使用的经停点列表，不是真正的要停车
var blackPoints: MutableList<RoutingSite>?// Routing 给算路引擎使用的黑名单点，目的是不参与算路
) )
/** /**
@@ -54,6 +48,7 @@ data class ContrailBean(
var contrailSaveTimeDPQP: Long = -1L, var contrailSaveTimeDPQP: Long = -1L,
var version: Long = -1L, var version: Long = -1L,
var passPoints: MutableList<RoutingSite>?, // 用于算路的经停点 var passPoints: MutableList<RoutingSite>?, // 用于算路的经停点
var blackPoints: MutableList<RoutingSite>?, // 用于算路的黑名單點
) )
/** /**

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

@@ -586,6 +586,7 @@ object TaxiRoutingModel {
val wayLatLons: MutableList<AutopilotControlParameters.AutoPilotLonLat> = ArrayList() val wayLatLons: MutableList<AutopilotControlParameters.AutoPilotLonLat> = ArrayList()
val blackLatLons: MutableList<AutopilotControlParameters.AutoPilotLonLat> = ArrayList() val blackLatLons: MutableList<AutopilotControlParameters.AutoPilotLonLat> = ArrayList()
// 途经点
if (!contrailBean.passPoints.isNullOrEmpty()) { if (!contrailBean.passPoints.isNullOrEmpty()) {
for (mogoLatLng in contrailBean.passPoints!!) { for (mogoLatLng in contrailBean.passPoints!!) {
wayLatLons.add( wayLatLons.add(
@@ -597,9 +598,10 @@ object TaxiRoutingModel {
} }
} }
if (!grayLineBean.blackPoints.isNullOrEmpty()) { // 黑名单点
for (mogoLatLng in grayLineBean.blackPoints!!) { if (!contrailBean.blackPoints.isNullOrEmpty()) {
wayLatLons.add( for (mogoLatLng in contrailBean.blackPoints!!) {
blackLatLons.add(
AutopilotControlParameters.AutoPilotLonLat( AutopilotControlParameters.AutoPilotLonLat(
mogoLatLng.wgs84Lat, mogoLatLng.wgs84Lat,
mogoLatLng.wgs84Lon mogoLatLng.wgs84Lon