diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index 3a7587c1cb..f57b295596 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -1109,16 +1109,22 @@ object TaxiTaskModel { "judgeEndStation() stationAngle = $stationAngle" ) + if ((!checkCurrentTaskCondition() + || (getCurTaskStatus() == TaskStatusEnum.StartTask.code)) + ) { + i(TAG, "task null or TaskStatus = ${getCurTaskStatus()}") + return + } //3、刚过站且过站距离在15m内, 提交到站 - if (stationAngle > 90 && distance <= TaxiUnmannedConst.ARRIVE_AT_START_STATION_DISTANCE) { - if ((!checkCurrentTaskCondition() - || (getCurTaskStatus() == TaskStatusEnum.StartTask.code)) - ) { - i(TAG, "task null or TaskStatus = ${getCurTaskStatus()}") - return - } + if (stationAngle > 90) { i(TAG, "judgeEndStation() = 刚过站且在15m内") submitArriveSite(endSite.siteId, true) + }else{ + // 4、 没有过站距离小于15m 速度小于0.5(根据M1来的模数 可能要调) + if (currentLocation.gnssSpeed < 0.5) { + i(TAG, "judgeEndStation() = 没有过站、速度基本为零且在15m内") + submitArriveSite(endSite.siteId, true) + } } } }