diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt index 188f5fc064..f90176c027 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt @@ -177,7 +177,7 @@ object BusPassengerModel{ routesResult = null mNextStationIndex = 0 } - cleanStation() + cleanStation("queryDriverSiteByCoordinate") if (mRouteLineInfoCallback != null) { mRouteLineInfoCallback!!.showNoTaskView() } @@ -206,7 +206,7 @@ object BusPassengerModel{ } if (code == 1003) { routesResult = null - cleanStation() + cleanStation("queryDriverSiteByCoordinate 1003") return } } @@ -238,7 +238,7 @@ object BusPassengerModel{ return } else if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && !station.isLeaving) { //到站 if (i == stations.size - 1) { - cleanStation() + cleanStation("updatePassengerRouteInfo最后一个站点") } suspendCalculate() @@ -309,7 +309,7 @@ object BusPassengerModel{ fun release() { releaseListeners() - cleanStation() + cleanStation("release") startOrStopOrderLoop(false) } @@ -600,7 +600,8 @@ object BusPassengerModel{ setStationPoint(startStation, endStation, lineId.toLong()) } - fun cleanStation() { + fun cleanStation(type:String) { + d(M_BUS_P + TAG, "清理站点 $type") setStationPoint(null, null, -1L) } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt index 9b75f040cc..72a72bd85e 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt @@ -84,7 +84,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ if (it.size > 0) { d(M_OCHCOMMON + TAG, "收到轨迹:${it.size}第一个点${it[0]}最后一个点:${it.last()}") if(globalPathResp.lineId!=null) { - if (globalPathResp.lineId == lineId) { + if (globalPathResp.lineId == lineId && !mRoutePoints.isNullOrEmpty()) { d(M_OCHCOMMON + TAG, "重复轨迹") startCalculateDistanceLoop() return