From 492849fa6509aba12bc9d51b74630934d60f99fd Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Wed, 23 Aug 2023 14:12:45 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20refactor:?=
 =?UTF-8?q?=20Html.fromHtml=20->=20HtmlCompat.fromHtml;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 9 +++------
 1 file changed, 3 insertions(+), 6 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 647ad81b88..4d26024b3d 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
@@ -274,7 +274,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
     /**
      * 任务和订单信息
      */
-    @RequiresApi(Build.VERSION_CODES.N)
     @SuppressLint("SetTextI18n", "UseCompatLoadingForDrawables")
     fun updateCurrentTaskAndOrderStatusChanged(taskAndOrder: QueryCurrentTaskRespBean.Result?) {
         if (taskAndOrder == null) return
@@ -400,15 +399,14 @@ class TaxiCurrentTaskFragment : BaseFragment(),
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
     private fun updateOrderUI(order: OrderDetail) {
         taskTypeTv.text = resources.getString(R.string.task_order)
         taskTypeTv.background = resources.getDrawable(R.drawable.task_order_type_btn_bg, null)
-        orderPhoneAndNum.text = Html.fromHtml(
+        orderPhoneAndNum.text = HtmlCompat.fromHtml(
             "<font color=\"#FFFFFF\"> " + order.bookingUserPhone + "</font>" +
                     "<font color=\"#6473B2\"> | </font>" +
                     "<font color=\"#FFFFFF\">" + order.passengerSize + "人" + "</font>",
-            Html.FROM_HTML_MODE_LEGACY
+            HtmlCompat.FROM_HTML_MODE_LEGACY
         )
         startStationName.text = order.orderStartSite?.siteName
         endStationName.text = order.orderEndSite?.siteName
@@ -470,7 +468,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
     private fun updateOtherInfo() {
         val currentCale = DateTimeUtils.getCurrentDateTime()
         val currentDay =
@@ -494,7 +491,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                 DateTimeUtil.MM_dd_HH_mm
             ) + "</big></font>")
         }
-        taskOtherInfo.text = Html.fromHtml(strHtml13, Html.FROM_HTML_MODE_LEGACY)
+        taskOtherInfo.text = HtmlCompat.fromHtml(strHtml13, HtmlCompat.FROM_HTML_MODE_LEGACY)
     }
 
     private fun updateUIShowStatus(taskType: Int, currentStatus: Int, order: OrderDetail?) {