From 017b3761283f83fbfe25f85bbb31ca506642688c Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 30 Oct 2023 19:30:06 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.0]=20=E4=BC=98=E5=8C=96TaxiCurrentTaskFrag?=
 =?UTF-8?q?ment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt | 6 ------
 .../com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt    | 6 ++----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt
index f2c0efba72..d0c72e4b9a 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt
@@ -41,12 +41,6 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
 
     companion object {
         const val TAG = "TaxiFragment"
-        fun newInstance(): TaxiFragment {
-            val args = Bundle()
-            val fragment = TaxiFragment()
-            fragment.arguments = args
-            return fragment
-        }
     }
 
     private var taskTabFragment: WeakReference<TaxiTaskTabFragment>? = null
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
index c591752449..e35c2f2165 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
@@ -1,6 +1,5 @@
 package com.mogo.och.taxi.ui.task
 
-import android.annotation.SuppressLint
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
@@ -172,11 +171,10 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                         if (currentTaskWithOrder == null) {
                             initContainerView(false)
                             removeAllMapMarker()
-                            updateNextTaskFragment(currentTaskWithOrder)
-                            return@collect
+                        }else{
+                            updateViewByCurrentTaskWithOrder(currentTaskWithOrder)
                         }
                         updateNextTaskFragment(currentTaskWithOrder)
-                        updateViewByCurrentTaskWithOrder(currentTaskWithOrder)
                     }
 
                     is TaskWithOrderUIState.UpdateOrderTripInfo -> {