From ad7151c8a4b7c437e055fc56a3fd66025b9538b9 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Mon, 13 Mar 2023 16:24:23 +0800
Subject: [PATCH] =?UTF-8?q?[sweeper]=20refactor:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=8A=A5=E7=AB=99=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=EF=BC=9B?=
 =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E6=88=90=E4=BB=BB=E5=8A=A1=E5=90=8E?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0toast=E6=8F=90=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/sweeper/fragment/SweeperFragment.kt   |  1 +
 .../och/sweeper/model/SweeperTaskModel.java   | 24 +++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
index 754b92b4a6..95515aedda 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
@@ -268,6 +268,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
                 mPresenter?.clearRouteList()
             }
             setTaskProgress("0")
+            ToastUtils.showLong("当前任务已完成，已刷新列表")
             return
         }
         when (typeEnum.code) {
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 ee7033834f..fc8c8f2084 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
@@ -306,12 +306,12 @@ public class SweeperTaskModel {
         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
+                    + ", 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
+            + ", mLatitude=" + gnssInfo.getLatitude() + ", mSubTaskType=" + mSubTaskType +", mIsSubTaskWorking=" + mIsSubTaskWorking
+                    + ", isAutopilotSubTaskArriveEndSite=" + isAutopilotSubTaskArriveEndSite
             );
             mLongitude = gnssInfo.getLongitude();
             mLatitude = gnssInfo.getLatitude();
@@ -446,10 +446,10 @@ public class SweeperTaskModel {
         //MAP 280 每隔100ms左右返回一次到站， 导致在到达中间站后再次滑动出发后会有时间差，收到一次到站，出现问题
         //此处比对 自驾告诉的子任务终点坐标和本地应到子任务终点坐标， 一致时才表示子任务完成
         if (data != null && data.getEndLocation() != null && mCurrentSubTaskDetail != null) {
-            Log.d(M_SWEEPER + TAG, "MAP到站通知：" + mCurrentSubTaskDetail.getEndSiteName() + "经度："
-                    + data.getEndLocation().getLongitude() + "纬度：" + data.getEndLocation().getLatitude());
-            CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "MAP到站通知：" + mCurrentSubTaskDetail.getEndSiteName() + "经度："
-                    + data.getEndLocation().getLongitude() + "纬度：" + data.getEndLocation().getLatitude());
+            Log.d(M_SWEEPER + TAG, "MAP到站通知：" + mCurrentSubTaskDetail.getEndSiteName() + " 经度："
+                    + 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
             String longitude = NumberFormatUtil.cutOutNumber(data.getEndLocation().getLongitude(), 5);
             String arriveLat = NumberFormatUtil.cutOutNumber(mCurrentSubTaskDetail.getEndSiteWgs64Lat(), 5);
@@ -459,10 +459,10 @@ 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);
+        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;
         }