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)