From bdc1deed403461a0afb95ad75b27dd5156306bf9 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Mon, 13 Mar 2023 13:49:48 +0800
Subject: [PATCH] =?UTF-8?q?[sweeper]=20fix:=20=E5=A2=9E=E5=8A=A0=E5=88=B0?=
 =?UTF-8?q?=E7=AB=99=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/sweeper/model/SweeperTaskModel.java   | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
index 694381dc3d..ee7033834f 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
@@ -305,6 +305,14 @@ public class SweeperTaskModel {
         @Override
         public void onChassisLocationGCJ02(@Nullable MogoLocation gnssInfo) {
             if (null == gnssInfo) return;
+            Log.d(M_SWEEPER + TAG, "高德定位到站：mLongitude = " + gnssInfo.getLongitude()
+                    + ", mLatitude" + gnssInfo.getLatitude() + ", mSubTaskType" + mSubTaskType + ", mIsSubTaskWorking" + mIsSubTaskWorking
+                    + ", isAutopilotSubTaskArriveEndSite" + isAutopilotSubTaskArriveEndSite
+            );
+            CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "高德定位到站：mLongitude = " + gnssInfo.getLongitude()
+            + ", mLatitude" + gnssInfo.getLatitude() + ", mSubTaskType" + mSubTaskType +", mIsSubTaskWorking" + mIsSubTaskWorking
+                    + ", isAutopilotSubTaskArriveEndSite" + isAutopilotSubTaskArriveEndSite
+            );
             mLongitude = gnssInfo.getLongitude();
             mLatitude = gnssInfo.getLatitude();
             if (mControllerStatusCallback != null) {
@@ -439,7 +447,7 @@ public class SweeperTaskModel {
         //此处比对 自驾告诉的子任务终点坐标和本地应到子任务终点坐标， 一致时才表示子任务完成
         if (data != null && data.getEndLocation() != null && mCurrentSubTaskDetail != null) {
             Log.d(M_SWEEPER + TAG, "MAP到站通知：" + mCurrentSubTaskDetail.getEndSiteName() + "经度："
-                    + data.getEndLocation().getLongitude() + "纬度：" + data.getEndLocation().getLongitude());
+                    + data.getEndLocation().getLongitude() + "纬度：" + data.getEndLocation().getLatitude());
             CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "MAP到站通知：" + mCurrentSubTaskDetail.getEndSiteName() + "经度："
                     + data.getEndLocation().getLongitude() + "纬度：" + data.getEndLocation().getLatitude());
             String latitude = NumberFormatUtil.cutOutNumber(data.getEndLocation().getLatitude(), 5); //wgs
@@ -451,12 +459,16 @@ public class SweeperTaskModel {
                 return;
             }
         }
+        Log.d(M_SWEEPER + TAG, "MAP到站通知：mSubTaskType" + mSubTaskType + "isAutopilotSubTaskArriveEndSite："
+                + isAutopilotSubTaskArriveEndSite + "mSubTaskId：" + mSubTaskId);
+        CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "MAP到站通知：mSubTaskType" + mSubTaskType + "isAutopilotSubTaskArriveEndSite："
+                + isAutopilotSubTaskArriveEndSite + "mSubTaskId：" + mSubTaskId);
         if (SubTaskTypeEnum.MANUAL_DRIVING_SUBTYPE.getCode() == mSubTaskType) {//人工驾驶子任务需要手动跳过，不能自动结束
             return;
         }
-        if (isAutopilotSubTaskArriveEndSite) return;
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "行程日志-当前==subTaskId="
-                + mSubTaskId);
+        if (isAutopilotSubTaskArriveEndSite) {
+            return;
+        }
         isAutopilotSubTaskArriveEndSite = true;
         //到达子任务终点 结束子任务
         subTaskEnd(mIsFirstSubtask, mIsLastSubtask, mSubTaskId);