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(
" " + order.bookingUserPhone + "" +
" | " +
"" + order.passengerSize + "人" + "",
- 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
) + "")
}
- 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?) {