From a0f23353f7d6643688a740e1f5b0ab612774c229 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Fri, 28 Jul 2023 09:54:20 +0800
Subject: [PATCH] =?UTF-8?q?[SweeperCloud]=20feat:=20=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5app=E5=90=8E=E9=87=8D=E6=96=B0=E6=8B=89?=
 =?UTF-8?q?=E5=8F=96=E4=BB=BB=E5=8A=A1=E5=90=8E=E9=87=8D=E6=96=B0=E7=BB=98?=
 =?UTF-8?q?=E5=88=B6=E9=AB=98=E7=B2=BE=E5=9C=B0=E5=9B=BE=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?marker;=20refactor:=20=E5=9B=A0=E7=9B=AE=E5=89=8D=E4=B8=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=B0=8F=E5=9C=B0=E5=9B=BE=EF=BC=8C=E8=B4=B4?=
 =?UTF-8?q?=E8=BE=B9=E6=95=B0=E6=8D=AE=E6=94=B6=E5=88=B0=E5=90=8E=E5=85=88?=
 =?UTF-8?q?=E4=B8=8D=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sweepercloud/fragment/SweeperFragment.kt  |  6 +++
 .../sweepercloud/model/SweeperTaskModel.java  | 37 ++++++++++---------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt
index 5f8b22339e..01db091efa 100644
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt
@@ -215,6 +215,12 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             setShowCurrentTaskPanelView(true)
             addTaskData()
             mPresenter?.isHasTaskInfo(true)
+
+            //恢复高精地图上的Marker
+            mCurrentRunningSubTaskInfo?.also {
+                removeHDMapMarkerBySubTask(it)
+                addHDMapMarkerBySubTask(it)
+            }
         } else {//云端下发的大任务信息需要弹窗提示（V3.2.0开始不需要安全员确认接取任务，只能默认接收）
             //是否需要弹窗确认
             getCurrentTaskView().setData(taskInfo)
diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java
index ed362650cb..8cfff0e946 100644
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java
@@ -438,24 +438,25 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
 
     @Override
     public void onSweeperFutianTaskIndexData(@NonNull RoboSweeperTaskIndexOuterClass.RoboSweeperTaskIndex roboSweeperTaskIndex) {
-        if (roboSweeperTaskIndex == null) {
-            return;
-        }
-
-        long current = System.currentTimeMillis();
-        if (current - mWeltDataCurrentTimeMillis <= WELT_DATA_INTERVAL_MILLIS) {
-            return;
-        }
-        mWeltDataCurrentTimeMillis = current;
-
-        //没有任务数据时，不处理贴边
-        if (!isHasTaskInfo) {
-            return;
-        }
-
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG,
-                "mSubTaskType：" + mSubTaskType + "+ onSweeperFutianTaskIndexData：" + printMessage(roboSweeperTaskIndex));
-        handleWeltData(roboSweeperTaskIndex);
+//        20230728 因小地图不展示了，贴边数据先不处理了，浪费资源
+//        if (roboSweeperTaskIndex == null) {
+//            return;
+//        }
+//
+//        long current = System.currentTimeMillis();
+//        if (current - mWeltDataCurrentTimeMillis <= WELT_DATA_INTERVAL_MILLIS) {
+//            return;
+//        }
+//        mWeltDataCurrentTimeMillis = current;
+//
+//        //没有任务数据时，不处理贴边
+//        if (!isHasTaskInfo) {
+//            return;
+//        }
+//
+//        CallerLogger.INSTANCE.d(M_SWEEPER + TAG,
+//                "mSubTaskType：" + mSubTaskType + "+ onSweeperFutianTaskIndexData：" + printMessage(roboSweeperTaskIndex));
+//        handleWeltData(roboSweeperTaskIndex);
     }
 
     /**