From a0322eeebe52d40a55d6aba4f613e1a4be7d747e Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Fri, 28 Jul 2023 22:52:05 +0800
Subject: [PATCH] =?UTF-8?q?[SweeperCloud]=20fix:=20=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AB=98=E7=B2=BE=E5=9C=B0=E5=9B=BEMarker?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=B5=B7=E7=82=B9/=E7=BB=88=E7=82=B9=20Marke?=
 =?UTF-8?q?r=E4=B8=BA=E4=BA=86=E9=81=BF=E5=85=8D=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=98=AF=20=E5=88=A0=E9=99=A4-=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=B5=B7=E7=82=B9-=E5=A2=9E=E5=8A=A0=E7=BB=88?=
 =?UTF-8?q?=E7=82=B9=EF=BC=8C=E4=BD=86=E6=98=AF=E5=9B=A0=E4=B8=BA=E9=83=BD?=
 =?UTF-8?q?=E6=98=AF=E5=BC=82=E6=AD=A5=E6=93=8D=E4=BD=9C=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=85=88=E6=B7=BB=E5=8A=A0=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E8=BF=99?=
 =?UTF-8?q?=E9=87=8C=E5=B0=863=E4=B8=AA=E6=93=8D=E4=BD=9C=E6=94=BE?=
 =?UTF-8?q?=E5=85=A5=E4=B8=80=E4=B8=AARunnable=E5=90=8C=E6=AD=A5=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sweepercloud/fragment/SweeperFragment.kt  | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 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 8f1eefa0cb..3a71d851a5 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
@@ -218,7 +218,6 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
 
             //恢复高精地图上的Marker
             mCurrentRunningSubTaskInfo?.also {
-                removeHDMapMarkerBySubTask(it)
                 addHDMapMarkerBySubTask(it)
             }
         } else {//云端下发的大任务信息需要弹窗提示（V3.2.0开始不需要安全员确认接取任务，只能默认接收）
@@ -280,7 +279,6 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
                             updateCurrentSubTaskInfo(index + 1)
 
                             // 先移除在添加 起终点 Marker
-                            removeHDMapMarkerBySubTask(subTaskList[index])
                             addHDMapMarkerBySubTask(subTaskList[index])
                         } else {
                             mCurrentRunningSubTaskInfo = null
@@ -884,26 +882,37 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
         val endPoint = subTask.endLocation
         val hdMarkerIdStart = "marker_sweeper_subtask_${subTask.subTaskId}_start"
         val hdMarkerIdEnd = "marker_sweeper_subtask_${subTask.subTaskId}_end"
-        setMapMaker(hdMarkerIdStart, startPoint.longitude, startPoint.latitude, true)
-        setMapMaker(hdMarkerIdEnd, endPoint.longitude, endPoint.latitude, false)
+
+        val setStartMarkerRunnable = createSetHDMapMakerRunnable(hdMarkerIdStart, startPoint.longitude, startPoint.latitude, true)
+        val setEndMarkerRunnable = createSetHDMapMakerRunnable(hdMarkerIdEnd, endPoint.longitude, endPoint.latitude, false)
+        val removeMarkerRunnable = createRemoveHDMapMakerRunnable()
+
+        val addSubTaskHDMarkRunnable = Runnable {
+            // 先移除高精地图中的 子任务 起终点 Marker, 避免重复添加
+            removeMarkerRunnable.run()
+            setStartMarkerRunnable.run()
+            setEndMarkerRunnable.run()
+        }
+        OCHThreadPoolManager.getsInstance().execute(addSubTaskHDMarkRunnable)
     }
 
     /**
      * 移除高精地图中的 子任务 起终点 Marker
      */
-    private fun removeHDMapMarkerBySubTask(subTask: SubTaskInfo) {
-        removeMapMaker()
+    private fun removeHDMapMarkerBySubTask(subTaskInfo: SubTaskInfo) {
+        val removeMarkerRunnable = createRemoveHDMapMakerRunnable()
+        OCHThreadPoolManager.getsInstance().execute(removeMarkerRunnable)
     }
 
     /**
-     * 设置高精地图里的Marker
+     * 设置高精地图里的Marker Runnable
      */
-    private fun setMapMaker(
+    private fun createSetHDMapMakerRunnable(
         uuid: String,
         longitude: Double,
         latitude: Double,
         isStartMarker: Boolean
-    ) {
+    ) : Runnable {
         //开启线程执行起终点marker设置
         val setMapMarkerRunnable = Runnable {
             CallerLogger.d(
@@ -934,13 +943,13 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             val overlayManager = CallerMapUIServiceManager.getOverlayManager()
             overlayManager?.showOrUpdatePoint(builder.build())
         }
-        OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable)
+        return setMapMarkerRunnable
     }
 
     /**
-     * 移除高精地图里的Marker
+     * 移除高精地图里的Marker Runnable
      */
-    private fun removeMapMaker() {
+    private fun createRemoveHDMapMakerRunnable() : Runnable{
         //开启线程移除起终点marker设置
         val removeMapMarkerRunnable = Runnable {
             CallerLogger.d(
@@ -950,6 +959,6 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
             val overlayManager = CallerMapUIServiceManager.getOverlayManager()
             overlayManager?.removeAllPointsInOwner(TYPE_MARKER_SWEEPER_SUBTASK_START_END)
         }
-        OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable)
+        return removeMapMarkerRunnable
     }
 }
\ No newline at end of file