From 05da6a6a42e6af87bab1243f4c14a7aff4c67325 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 22 Aug 2023 18:31:30 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E8=BF=90=E8=90=A5=E5=8D=95/=E6=BC=94?=
 =?UTF-8?q?=E7=BB=83=E5=8D=95=E5=8F=96=E6=B6=88/=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E7=99=BB=E9=99=86,=20=E6=B8=85=E9=99=A4=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E6=89=80=E6=9C=89marker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/ui/TaxiBeingTaskFragment.kt | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
index 901f668969..a50d6f300d 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
@@ -130,6 +130,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
                             if ((taskAndOrderUiState.untruthTask == null && mCurrentTaskAndOrder != null
                                 && mCurrentTaskAndOrder!!.endSite == null) || mCurrentTaskAndOrder == null){
                                 isHaveBeingOrder(false)
+                                removeAllMapMarker()
                                 return@collect
                             }
 
@@ -251,14 +252,10 @@ class TaxiBeingTaskFragment : BaseFragment(),
     @SuppressLint("SetTextI18n", "UseCompatLoadingForDrawables")
     fun updateCurrentOrderStatusChanged(taskAndOrder: QueryCurrentTaskRespBean.Result?) {
         if (taskAndOrder == null) return
-        if (taskAndOrder.endSite == null && taskAndOrder.order == null){
-            isHaveBeingOrder(false)
-            return
-        }
-
-        if (taskAndOrder.currentStatus == TaskStatusEnum.CompleteTask.code
+        if ((taskAndOrder.endSite == null || taskAndOrder.currentStatus == TaskStatusEnum.CompleteTask.code)
             && taskAndOrder.order == null){
             isHaveBeingOrder(false)
+            removeAllMapMarker()
             return
         }
 
@@ -871,6 +868,19 @@ class TaxiBeingTaskFragment : BaseFragment(),
         }
     }
 
+    private fun removeAllMapMarker() {
+        //开启线程移除起终点marker设置
+        val removeAllMapMarkerRunnable = Runnable {
+            d(
+                SceneConstant.M_TAXI + "removeAllMapMarkerRunnable=" + Thread.currentThread()
+            )
+            val overlayManager =
+                getOverlayManager()
+            overlayManager?.removeAllLinesInOwner(TYPE_MARKER_TAXI_ORDER)
+        }
+        OCHThreadPoolManager.getsInstance().execute(removeAllMapMarkerRunnable)
+    }
+
     private fun updateOrderBottomBtn(txt: String?, txtColorId: Int, bgColorId: Int, isClickable: Boolean) {
         taskClickBtn.text = txt
         taskClickBtn.setTextColor(txtColorId)