From 002d572510c79fcd6ff6811ed2545bf1ac297d56 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 28 Aug 2023 16:28:00 +0800
Subject: [PATCH] =?UTF-8?q?[5.0.0]=20[taxi]=20[=E6=B2=A1=E6=9C=89=E8=BF=87?=
 =?UTF-8?q?=E7=AB=99=E8=B7=9D=E7=A6=BB=E5=B0=8F=E4=BA=8E15m=20=E9=80=9F?=
 =?UTF-8?q?=E5=BA=A6=E5=B0=8F=E4=BA=8E0.5=E7=9B=B4=E6=8E=A5=E5=88=B0?=
 =?UTF-8?q?=E7=AB=99]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/ui/task/TaxiTaskModel.kt    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

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)
+                }
             }
         }
     }