From d06c9b56fc2cc5a77c790ef24b68676972b51cb7 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 21 Sep 2023 15:58:20 +0800
Subject: [PATCH] =?UTF-8?q?[6.1.0]=20=E4=BB=BB=E5=8A=A1=E4=B8=BA=E7=A9=BA,?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E7=BE=8E=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taxi/ui/task/TaxiCurrentTaskFragment.kt   | 20 ++++++++-----------
 .../mogo/och/taxi/ui/task/TaxiTaskModel.kt    |  7 ++-----
 2 files changed, 10 insertions(+), 17 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 c02256f181..b9c0a1276a 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
@@ -117,18 +117,14 @@ class TaxiCurrentTaskFragment : BaseFragment(),
             TAG,
             "hasCurrentTask  = $hasCurrentTask"
         )
-        try {
-            if (hasCurrentTask) {
-                noTaskData.visibility = View.GONE
-                mCurrentTaskLayout.visibility = View.VISIBLE
-            } else {
-                noTaskData.visibility = View.VISIBLE
-                noOrderDataTv.text = "暂无进行中订单"
-                mCurrentTaskLayout.visibility = View.GONE
-                taskOtherInfo.text = "距离 -- 公里, 用时 -- 分钟"
-            }
-        } catch (e: NullPointerException) { //可能会出现订单信息已经轮询回来，但进行中页面控件还未初始化完成的情况
-            TaxiTaskModel.clearCurrentOCHOrder()
+        if (hasCurrentTask) {
+            noTaskData.visibility = View.GONE
+            mCurrentTaskLayout.visibility = View.VISIBLE
+        } else {
+            noTaskData.visibility = View.VISIBLE
+            noOrderDataTv.text = "暂无进行中订单"
+            mCurrentTaskLayout.visibility = View.GONE
+            taskOtherInfo.text = "距离 -- 公里, 用时 -- 分钟"
         }
     }
 
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
index a2e1d7f630..24bb58a87d 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
@@ -724,6 +724,7 @@ object TaxiTaskModel {
                                     listener.onTaskWithOrderDataChanged(null)
                                 }
                             }
+                            clearCurrentOCHOrder()
                             return
                         }
 
@@ -1329,18 +1330,14 @@ object TaxiTaskModel {
      * 清除任务订单信息
      */
     fun clearCurrentOCHOrder() {
-        mCurrentTaskWithOrder = null
-        mDriveToNearestStationTask = null
         clearAutopilotControlParameters()
-        TaxiTrajectoryManager.getInstance().syncTrajectoryInfo()
-        SharedPrefsMgr.getInstance(mContext).remove(TaxiUnmannedConst.SP_KEY_OCH_TAXI_ORDER)
         isRestartAutopilot = false
         if (FunctionBuildConfig.isDemoMode) {
             // 当美化模式（演示模式）开启时: 取消或订单已完成时，置false
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false
             CallerAutoPilotControlManager.setIgnoreConditionDraw(false)
             CallerAutoPilotControlManager.setIPCDemoMode(false)
-            d(TAG, "美化模式-ignore：置为false（已完成or清除当前订单）")
+            d(TAG, "美化模式-ignore：置为false（已完成or清除当前任务）")
         }
     }