From 5bb8182dcb159a9883823d8b8ee07c019122d9d9 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 2 Nov 2023 11:06:27 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.0]=20TaxiCurrentTaskFragment=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt  | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 e35c2f2165..ae15fe880e 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
@@ -495,7 +495,8 @@ class TaxiCurrentTaskFragment : BaseFragment(),
 
         taskStatus.text = resources.getString(R.string.task_start_end_site)
         taskTypeTv.background =
-            resources.getDrawable(R.drawable.task_unreal_type_btn_bg, null)
+            ContextCompat.getDrawable(MainMoGoApplication.getApp().applicationContext
+                ,R.drawable.task_unreal_type_btn_bg)
         taskTypeTv.text = resources.getString(R.string.task_exercise)
         startStationName.text = startSite.siteName
         endStationName.text = endSite.siteName
@@ -626,7 +627,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
      */
     private fun updateCurrentTaskTripInfo(meters: Long, timeInSecond: Long) {
         UiThreadHandler.post {
-            val currentTaskWithOrder = TaxiTaskModel.getCurrentTaskWithOrder() ?: return@post
+            TaxiTaskModel.getCurrentTaskWithOrder() ?: return@post
             d(
                 TAG,
                 "updateCurrentTaskTripInfo, taskUtil, ${
@@ -649,7 +650,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
     private fun startOrEndService() {
         val currentTaskWithOrder = TaxiTaskModel.getCurrentTaskWithOrder()
         if (currentTaskWithOrder?.order == null) return
-        val order = currentTaskWithOrder?.order
+        val order = currentTaskWithOrder.order
         if (TaxiOrderStatusEnum.ArriveAtStart.code == order!!.orderStatus) { //到达乘客上车点，司机可跳过乘客屏认证
             mViewModel.sendUiIntent(TaskUiIntent.JumpPassengerCheck)
         } else if (TaxiOrderStatusEnum.UserArriveAtStart.code == order.orderStatus) {
@@ -785,7 +786,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
      * 绘制地图起点终点
      * @param isAdd
      * @param uuid
-     * @param station
      */
     private fun setOrRemoveMapMaker(
         isAdd: Boolean, uuid: String,