From 23d198ac36a92df83555baca2817607bf521629a Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Fri, 22 Dec 2023 20:08:22 +0800
Subject: [PATCH] =?UTF-8?q?[v6.2.6]=E6=81=A2=E5=A4=8D=E5=8E=9F=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=96=B9=E5=BC=8F=EF=BC=8C=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?IllegalStateException=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taxi/ui/task/TaxiCurrentTaskFragment.kt   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

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 68b322045c..f7aa4113b9 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
@@ -16,6 +16,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02
 import com.mogo.eagle.core.function.main.MainMoGoApplication
 import com.mogo.eagle.core.network.utils.GsonUtil
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI
@@ -68,12 +69,7 @@ import kotlinx.coroutines.flow.map
 class TaxiCurrentTaskFragment : BaseFragment(),
     View.OnClickListener, ICommonNaviChangedCallback {
 
-    private val mViewModel: TaxiCurrentTaskViewModel by lazy {
-        ViewModelProvider(
-            this,
-            ViewModelProvider.NewInstanceFactory()
-        )[TaxiCurrentTaskViewModel::class.java]
-    }
+    private lateinit var mViewModel: TaxiCurrentTaskViewModel
 
     private var mPrepareTasCountDownTimer: CountDownTimer? = null
 
@@ -96,6 +92,14 @@ class TaxiCurrentTaskFragment : BaseFragment(),
         return this.javaClass.simpleName
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        mViewModel = ViewModelProvider(
+            this,
+            ViewModelProvider.NewInstanceFactory()
+        )[TaxiCurrentTaskViewModel::class.java]
+    }
+
     override fun initViews() {
         initOnClickListener()
         initContainerView(false)
@@ -308,7 +312,11 @@ class TaxiCurrentTaskFragment : BaseFragment(),
     }
 
     fun onCarTakeOrderStatusChanged() {
-        mViewModel.sendUiIntent(TaskUiIntent.StartOrEndTakeOrder)
+        if (this::mViewModel.isInitialized) {
+            mViewModel.sendUiIntent(TaskUiIntent.StartOrEndTakeOrder)
+        } else {
+            CallerLogger.e(TAG, "onCarTakeOrderStatusChanged: mViewModel is not Initialized")
+        }
     }
 
     /**