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 1060a1782d..378e8580a2 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
@@ -5,6 +5,7 @@ import android.graphics.Color
import android.graphics.drawable.GradientDrawable
import android.os.Bundle
import android.os.CountDownTimer
+import android.text.TextUtils
import android.view.View
import androidx.core.content.ContextCompat
import androidx.lifecycle.ViewModelProvider
@@ -50,6 +51,7 @@ import kotlinx.android.synthetic.main.task_fragment_current.naviToEnd
import kotlinx.android.synthetic.main.task_fragment_current.naviToStart
import kotlinx.android.synthetic.main.task_fragment_current.noTaskData
import kotlinx.android.synthetic.main.task_fragment_current.orderPhoneAndNum
+import kotlinx.android.synthetic.main.task_fragment_current.pathwayPoint
import kotlinx.android.synthetic.main.task_fragment_current.startPoint
import kotlinx.android.synthetic.main.task_fragment_current.startStationName
import kotlinx.android.synthetic.main.task_fragment_current.taskClickBtn
@@ -249,6 +251,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
naviToStart.visibility = View.GONE
naviToEnd.visibility = View.VISIBLE
taskOtherInfo.visibility = View.VISIBLE
+ pathwayPoint.visibility = View.GONE
// 更新任务状态,起点,终点
taskStatus.text = resources.getString(R.string.task_start_to_virtual_site)
@@ -372,6 +375,8 @@ class TaxiCurrentTaskFragment : BaseFragment(),
taskOtherInfo.visibility =
if (currentStatus == TaskStatusEnum.GetTask.code) View.GONE else View.VISIBLE
+ pathwayPoint.visibility = View.GONE
+
if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
updateOrderUI(order)
VoiceNotice.showNotice("已为您接到订单")
@@ -391,6 +396,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
TaskTypeEnum.ToOrderEndTask.code, TaskTypeEnum.ToOrderStartTask.code -> {// 接驾任务 或 送驾任务
order?.also {
+ updatePathwayPoint(taskType,endSite?.siteName)
handleOrderView(it)
updateOrderUI(it)
}
@@ -401,6 +407,13 @@ class TaxiCurrentTaskFragment : BaseFragment(),
updateRemainDistanceAndTime(false)
}
+ private fun updatePathwayPoint(taskType: Int,endSiteName: String?) {
+ if (TextUtils.isEmpty(endSiteName)) return
+ pathwayPoint.visibility = if (taskType == TaskTypeEnum.ToOrderStartTask.code)
+ View.VISIBLE else View.GONE
+ pathwayPoint.text = "途径: $endSiteName"
+ }
+
private fun updateMapMarkers(taskAndOrder: QueryCurrentTaskRespBean.Result?) {
if (taskAndOrder != null && taskAndOrder!!.startSite != null
&& taskAndOrder!!.endSite != null
diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/task_pathway_point_bg.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/task_pathway_point_bg.xml
new file mode 100644
index 0000000000..b19de47c25
--- /dev/null
+++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/task_pathway_point_bg.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml
index 80094058e0..e9590279ee 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml
@@ -59,6 +59,23 @@
android:textColor="@android:color/white"
android:textSize="@dimen/dp_28"
android:text="183XXXX5400 | -人"/>
+
+
+
+ app:layout_constraintTop_toBottomOf="@+id/pathwayPoint"/>