diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt index e13446132e..5b3e655399 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt @@ -14,13 +14,7 @@ data class GrayLineBean( var lineFailCount: Int?, //线路累计反馈不可用次数 var isChoosed: Boolean = false, //当前是否选中 var startSite: RoutingSite?, - var endSite: RoutingSite?, - var hdMapDBVersionCode: String?,// Routing 运营平台通过算路引擎算这条路时候使用的对应高精地图版本号 - var hdMapDBVersionName: String?,// Routing 运营平台通过算路引擎算这条路时候使用的对应高精地图版本名 - var routingEnginVersionCode: String?,// Routing 运营平台当前的算路引擎版本号码 - var routingEnginVersionName: String?,// Routing 运营平台当前的算路引擎版本名称 - var wayPoints: MutableList?,// Routing 给算路引擎使用的经停点列表,不是真正的要停车 - var blackPoints: MutableList?// Routing 给算路引擎使用的黑名单点,目的是不参与算路 + var endSite: RoutingSite? ) /** @@ -54,6 +48,7 @@ data class ContrailBean( var contrailSaveTimeDPQP: Long = -1L, var version: Long = -1L, var passPoints: MutableList?, // 用于算路的经停点 + var blackPoints: MutableList?, // 用于算路的黑名單點 ) /** diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt index e5acf99936..6957b952c0 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt @@ -586,6 +586,7 @@ object TaxiRoutingModel { val wayLatLons: MutableList = ArrayList() val blackLatLons: MutableList = ArrayList() + // 途经点 if (!contrailBean.passPoints.isNullOrEmpty()) { for (mogoLatLng in contrailBean.passPoints!!) { wayLatLons.add( @@ -597,9 +598,10 @@ object TaxiRoutingModel { } } - if (!grayLineBean.blackPoints.isNullOrEmpty()) { - for (mogoLatLng in grayLineBean.blackPoints!!) { - wayLatLons.add( + // 黑名单点 + if (!contrailBean.blackPoints.isNullOrEmpty()) { + for (mogoLatLng in contrailBean.blackPoints!!) { + blackLatLons.add( AutopilotControlParameters.AutoPilotLonLat( mogoLatLng.wgs84Lat, mogoLatLng.wgs84Lon