[自主算路验证] feat: 增加选择路线页面，列表选中，loading，选中展示任务，下方按钮展示等逻辑；

OCH/taxi/unmanned-driver/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mogo.och.taxi">
     <application>
-        <activity android:name=".ui.routing.TaxiRoutingChooseLineActivity"
+        <activity android:name=".ui.routing.TaxiRoutingChooseTaskActivity"
             android:theme="@style/RoutingChooseLineDialogStyle"
             android:launchMode="singleTask"
             android:screenOrientation="landscape" />

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiDriverEventConst.java

@@ -13,4 +13,8 @@ public interface TaxiDriverEventConst {
         String EVENT_TYPE_SHOW_RED_POINT = "event_type_tab_fragment_show_red_point";
         String EVENT_TYPE_TASK_WITH_ORDER_CHANGED = "event_type_tab_fragment_task_with_order_changed";
     }
+
+    interface RoutingActivityEvent {
+        String EVENT_TYPE_GET_CHOSEN_LINE_TASK_ID = "event_type_get_chosen_line_task_id";
+    }
 }

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt

@@ -1,6 +1,7 @@
 package com.mogo.och.taxi.ui.routing
 
 import android.content.Context
+import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -19,6 +20,7 @@ class TaxiRoutingChooseLineAdapter(
     }
 
     private var mItemClickListener: OnChooseLineItemClickListener? = null
+    private var mLastChoosedLineIndex = -1
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SwitchLineViewHolder {
         val view = LayoutInflater.from(mContext).inflate(
@@ -37,20 +39,24 @@ class TaxiRoutingChooseLineAdapter(
         if (data.isChoosed) {
             holder.itemView.setBackgroundResource(R.drawable.routing_choose_line_shape_select_line_item_bg_selected)
         } else {
-            holder.itemView.setBackgroundResource(R.drawable.routing_choose_line_shape_select_line_item_bg_normal)
+            holder.itemView.setBackgroundColor(Color.parseColor("#162761"))
         }
 
         //设置item点击事件
         holder.itemView.setOnClickListener {
             mData.forEachIndexed { index, result ->
-                if (result.isChoosed) {
+                if (result.isChoosed && index != currentPosition) {
                     result.isChoosed = false
-
+                    notifyItemChanged(index)
                 }
             }
-            mData[currentPosition].isChoosed = true
+            mData[currentPosition].isChoosed = currentPosition != mLastChoosedLineIndex
             notifyItemChanged(currentPosition)
-            mItemClickListener?.onItemClick(currentPosition, false)
+            mItemClickListener?.onItemClick(
+                currentPosition,
+                currentPosition != mLastChoosedLineIndex
+            )
+            mLastChoosedLineIndex = currentPosition
         }
     }
 
@@ -63,7 +69,7 @@ class TaxiRoutingChooseLineAdapter(
     }
 
     interface OnChooseLineItemClickListener {
-        fun onItemClick(position: Int, close: Boolean)
+        fun onItemClick(position: Int, isChoosed: Boolean)
     }
 
     class SwitchLineViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseTaskActivity.kt

@@ -7,31 +7,39 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration
 import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.common.module.utils.FlowBus
 import com.mogo.och.taxi.R
 import com.mogo.och.taxi.bean.TaxiRoutingQueryLineResponse
-import kotlinx.android.synthetic.main.routing_choose_line_activity.btnChooseLineSubmit
-import kotlinx.android.synthetic.main.routing_choose_line_activity.btnClose
-import kotlinx.android.synthetic.main.routing_choose_line_activity.chooseLineListView
+import com.mogo.och.taxi.constant.TaxiDriverEventConst
+import kotlinx.android.synthetic.main.routing_choose_task_activity.btnChooseLineSubmit
+import kotlinx.android.synthetic.main.routing_choose_task_activity.btnClose
+import kotlinx.android.synthetic.main.routing_choose_task_activity.chooseLineListView
 import kotlinx.android.synthetic.main.routing_no_data_common_view.noDataContainer
-import kotlinx.android.synthetic.main.taxi_debug_order.currentLineId
 
-class TaxiRoutingChooseLineActivity : AppCompatActivity() {
+class TaxiRoutingChooseTaskActivity : AppCompatActivity() {
 
     companion object {
-        const val TAG = "TaxiRoutingChooseLineActivity"
+        const val TAG = "TaxiRoutingChooseTaskActivity"
     }
 
+    private val mLoadingDialog: TaxiRoutingLoadingDialog by lazy {
+        TaxiRoutingLoadingDialog(
+            this
+        )
+    }
     private lateinit var mChooseLineListAdapter: TaxiRoutingChooseLineAdapter
     private lateinit var mLinearLayoutManager: LinearLayoutManager
     private val mRoutingLineList: MutableList<TaxiRoutingQueryLineResponse.Result> = ArrayList()
-    private var mCurrentChoosedLineId: Int? = -1
+    private var mCurrentChosenLineId: Int? = -1
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.routing_choose_line_activity)
+        setContentView(R.layout.routing_choose_task_activity)
         initWindowParams()
         initView()
         loadData()
@@ -61,7 +69,7 @@ class TaxiRoutingChooseLineActivity : AppCompatActivity() {
         mChooseLineListAdapter.setOnLineItemClickListener(object :
             TaxiRoutingChooseLineAdapter.OnChooseLineItemClickListener {
             override fun onItemClick(position: Int, close: Boolean) {
-                mCurrentChoosedLineId = mRoutingLineList[position].lineId
+                mCurrentChosenLineId = mRoutingLineList[position].lineId
             }
         })
 
@@ -69,11 +77,19 @@ class TaxiRoutingChooseLineActivity : AppCompatActivity() {
             finish()
         }
         btnChooseLineSubmit.setOnClickListener {
-            if (mCurrentChoosedLineId == -1) {
+            if (mCurrentChosenLineId == -1) {
                 ToastUtils.showLong("请先选择任务")
                 return@setOnClickListener
             }
-            ToastUtils.showLong("当前选择的路线LineId:$currentLineId")
+            ToastUtils.showLong("当前选择的路线LineId:$mCurrentChosenLineId")
+            mLoadingDialog.showLoading()
+            UiThreadHandler.postDelayed({
+                mLoadingDialog.hideLoading()
+                FlowBus.with<Int>(TaxiDriverEventConst.RoutingActivityEvent.EVENT_TYPE_GET_CHOSEN_LINE_TASK_ID)
+                    .post(this.lifecycleScope, 1000)
+                mChooseLineListAdapter.setOnLineItemClickListener(null)
+                finish()
+            }, 3000L)
         }
     }
 
@@ -123,14 +139,6 @@ class TaxiRoutingChooseLineActivity : AppCompatActivity() {
         }
     }
 
-    fun onChangeLineIdSuccess() {
-        //ToastUtils.showLong(resources.getString(R.string.bus_change_line_commit_tip_s))
-        //mPresenter?.queryBusRoutes()
-        mChooseLineListAdapter.setOnLineItemClickListener(null)
-        //mPresenter?.removeListener()
-        finish()
-    }
-
     override fun onDestroy() {
         super.onDestroy()
     }

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt

@@ -2,10 +2,22 @@ package com.mogo.och.taxi.ui.routing
 
 import android.content.Intent
 import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import com.mogo.commons.mvp.BaseFragment
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.och.common.module.utils.FlowBus
 import com.mogo.och.taxi.R
+import com.mogo.och.taxi.constant.TaxiDriverEventConst
 import kotlinx.android.synthetic.main.routing_fragment.btnChooseTask
+import kotlinx.android.synthetic.main.routing_fragment.btnStartTask
+import kotlinx.android.synthetic.main.routing_fragment.finishSubmitIssueGroup
+import kotlinx.android.synthetic.main.routing_fragment.headerTitleContainer
+import kotlinx.android.synthetic.main.routing_fragment.mCurrentTaskLayout
+import kotlinx.android.synthetic.main.routing_fragment.noDataContainer
+import kotlinx.android.synthetic.main.routing_fragment.taskTitleTv
 
 class TaxiRoutingFragment : BaseFragment() {
 
@@ -30,8 +42,57 @@ class TaxiRoutingFragment : BaseFragment() {
 
     override fun initViews() {
         btnChooseTask.setOnClickListener {
-            val intent = Intent(context, TaxiRoutingChooseLineActivity::class.java)
+            val intent = Intent(context, TaxiRoutingChooseTaskActivity::class.java)
             startActivity(intent)
         }
+        showChooseTaskView()
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        initEventBus()
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    private fun initEventBus() {
+        FlowBus.with<Int>(TaxiDriverEventConst.RoutingActivityEvent.EVENT_TYPE_GET_CHOSEN_LINE_TASK_ID)
+            .register(this) { taskId ->
+                ToastUtils.showLong("接收到taskId:$taskId")
+                showCurrentLineTaskContentView()
+            }
+    }
+
+    private fun showChooseTaskView() {
+        noDataContainer.visibility = View.VISIBLE
+        mCurrentTaskLayout.visibility = View.GONE
+        headerTitleContainer.visibility = View.GONE
+
+        btnChooseTask.visibility = View.VISIBLE
+        btnStartTask.visibility = View.GONE
+        finishSubmitIssueGroup.visibility = View.GONE
+    }
+
+    private fun showCurrentLineTaskContentView() {
+        noDataContainer.visibility = View.GONE
+        mCurrentTaskLayout.visibility = View.VISIBLE
+
+        headerTitleContainer.visibility = View.VISIBLE
+        taskTitleTv.text = "测试任务测试任务"
+
+        btnChooseTask.visibility = View.GONE
+        btnStartTask.visibility = View.VISIBLE
+        btnStartTask.setOnClickListener {
+            showFinishTaskView()
+        }
+        finishSubmitIssueGroup.visibility = View.GONE
+    }
+
+    private fun showFinishTaskView() {
+        btnChooseTask.visibility = View.GONE
+        btnStartTask.visibility = View.GONE
+        finishSubmitIssueGroup.visibility = View.VISIBLE
     }
 }

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingLoadingDialog.kt

@@ -0,0 +1,73 @@
+package com.mogo.och.taxi.ui.routing
+
+import android.animation.ObjectAnimator
+import android.content.Context
+import android.view.animation.LinearInterpolator
+import androidx.lifecycle.LifecycleObserver
+import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
+import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.och.taxi.R
+import kotlinx.android.synthetic.main.dialog_routing_loading.dialog_loading_text
+import kotlinx.android.synthetic.main.dialog_routing_loading.dialog_loading_view
+
+/**
+ * loading
+ */
+class TaxiRoutingLoadingDialog : BaseFloatDialog, LifecycleObserver {
+    private var objectAnimator: ObjectAnimator? = null
+    private val mLoadingView by lazy { dialog_loading_view }
+    private val mLoadingText by lazy { dialog_loading_text }
+    private var mRunnable:Runnable= Runnable {
+        ToastUtils.showLong("超时未响应，请求失败")
+        hideLoading()
+    }
+
+    constructor(context: Context) : super(context)
+
+    init {
+        setContentView(R.layout.dialog_routing_loading)
+        setCanceledOnTouchOutside(false)
+    }
+
+    /**
+     * 开始旋转
+     */
+    private fun startRotation() {
+        objectAnimator = ObjectAnimator.ofFloat(mLoadingView, "rotation", -720f, 0f)
+        objectAnimator?.let {
+            it.duration = 3000
+            it.repeatCount = -1
+            it.interpolator = LinearInterpolator()
+            it.start()
+        }
+    }
+
+    /**
+     * 停止旋转
+     */
+    private fun stopRotation() {
+        objectAnimator?.let {
+            if (it.isRunning) {
+                it.end()
+                objectAnimator = null
+            }
+        }
+    }
+
+    /**
+     * 显示dialog
+     */
+    fun showLoading() {
+        mLoadingText.text = "请求中，请稍后..."
+        startRotation()
+        show()
+    }
+
+    /**
+     * 隐藏dialog
+     */
+    fun hideLoading() {
+        stopRotation()
+        dismiss()
+    }
+}

OCH/taxi/unmanned-driver/src/main/res/drawable/routing_btn_bg_finish_task.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/routing_btn_left_pressed" android:state_pressed="true" /> <!-- pressed -->
+    <item android:drawable="@drawable/routing_btn_left_default" /> <!-- default -->
+</selector>

OCH/taxi/unmanned-driver/src/main/res/drawable/routing_btn_bg_submit_issue.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/routing_btn_right_pressed" android:state_pressed="true" /> <!-- pressed -->
+    <item android:drawable="@drawable/routing_btn_right_default" /> <!-- default -->
+</selector>

OCH/taxi/unmanned-driver/src/main/res/layout/dialog_routing_loading.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="@dimen/dp_300"
+    android:layout_height="@dimen/dp_300"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:layout_gravity="center">
+
+    <ImageView
+        android:id="@+id/dialog_loading_view"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_80"
+        android:src="@drawable/routing_loading_nor" />
+
+    <TextView
+        android:id="@+id/dialog_loading_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="请求中，请稍后..."
+        android:textColor="#CCFFFFFF"
+        android:layout_marginTop="@dimen/dp_10"/>
+</LinearLayout>

OCH/taxi/unmanned-driver/src/main/res/layout/routing_choose_line_list_item.xml

@@ -4,13 +4,27 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/dp_5"
     android:background="@drawable/routing_choose_line_shape_select_line_item_bg_normal">
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/todayVerifyNumTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_34"
+        android:layout_marginEnd="79dp"
+        android:maxLines="1"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/dp_36"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="本车今日已验证：1次" />
+
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/switchLineNameTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_80"
+        android:layout_marginStart="80dp"
         android:layout_marginTop="@dimen/dp_34"
         android:ellipsize="end"
         android:maxLines="2"
@@ -18,34 +32,23 @@
         android:textSize="@dimen/dp_46"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="线路名称线路名称线路名称" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/todayVerifyNumTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginBottom="@dimen/dp_35"
-        android:maxLines="1"
-        android:textColor="@color/taxi_color_ccb9c3e9"
-        android:textSize="@dimen/dp_36"
-        app:layout_constraintStart_toStartOf="@+id/switchLineNameTextView"
-        app:layout_constraintTop_toBottomOf="@+id/switchLineNameTextView"
-        tools:text="本车今日已验证：1次" />
+        app:layout_constraintRight_toLeftOf="@+id/todayVerifyNumTextView"
+        tools:text="线路名称线路名称线路" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/historyVerifyNumTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginEnd="@dimen/dp_80"
         android:layout_marginBottom="@dimen/dp_35"
+        android:gravity="right|center_vertical"
         android:maxLines="1"
         android:textColor="@color/taxi_color_ccb9c3e9"
-        android:textSize="@dimen/dp_36"
-        app:layout_constraintLeft_toRightOf="@+id/todayVerifyNumTextView"
+        android:textSize="@dimen/dp_30"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/todayVerifyNumTextView"
-        app:layout_constraintTop_toBottomOf="@+id/switchLineNameTextView"
+        app:layout_constraintTop_toBottomOf="@+id/todayVerifyNumTextView"
         tools:text="路线累计反馈0可用，1不可用" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

OCH/taxi/unmanned-driver/src/main/res/layout/routing_choose_task_activity.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/routing_verify_choose_line_bg">
+    android:background="@color/routing_verify_choose_line_bg"
+    tools:ignore="MissingDefaultResource">
 
     <View
         android:id="@+id/chooseLineHint"

OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml

@@ -66,7 +66,58 @@
                 android:text="@string/routing_verify_btn_choose_task"
                 android:textColor="#FFFFFF"
                 android:textSize="@dimen/dp_44"
+                app:layout_constraintBottom_toBottomOf="parent"
+                tools:visibility="gone"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/btnStartTask"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_132"
+                android:background="@drawable/routing_click_btn_bg"
+                android:gravity="center"
+                android:text="@string/routing_verify_btn_start_task"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/dp_44"
+                tools:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent" />
+
+            <TextView
+                android:id="@+id/btnFinishTask"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/dp_116"
+                android:background="@drawable/routing_btn_bg_finish_task"
+                android:gravity="center"
+                android:text="结束任务"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/dp_44"
+                android:visibility="visible"
+                android:layout_weight="1"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintWidth_percent="0.55"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+            <TextView
+                android:id="@+id/btnSummitIssue"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/dp_116"
+                android:layout_weight="1"
+                android:background="@drawable/routing_btn_bg_submit_issue"
+                android:gravity="center"
+                android:text="问题打点"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/dp_44"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintWidth_percent="0.55" />
+
+            <androidx.constraintlayout.widget.Group
+                android:id="@+id/finishSubmitIssueGroup"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="visible"
+                app:constraint_referenced_ids="btnFinishTask,btnSummitIssue"
+                tools:visibility="visible" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -80,70 +131,17 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/taskStatus"
+                android:id="@+id/taskHintTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_40"
                 android:layout_marginTop="@dimen/dp_54"
-                android:text="前往接驾"
+                android:text="当前任务"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/dp_34"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/taskTypeTv"
-                android:layout_width="@dimen/dp_92"
-                android:layout_height="@dimen/dp_38"
-                android:layout_marginStart="@dimen/dp_16"
-                android:background="@drawable/task_order_type_btn_bg"
-                android:gravity="center"
-                android:text="运营单"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/dp_24"
-                app:layout_constraintBottom_toBottomOf="@+id/taskStatus"
-                app:layout_constraintStart_toEndOf="@+id/taskStatus"
-                app:layout_constraintTop_toTopOf="@+id/taskStatus" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/cancelOrder"
-                android:layout_width="@dimen/dp_42"
-                android:layout_height="@dimen/dp_42"
-                android:layout_marginEnd="@dimen/dp_40"
-                android:src="@drawable/taxi_report_order_cancel_icon"
-                app:layout_constraintBottom_toBottomOf="@+id/taskStatus"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/taskStatus" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/orderPhoneAndNum"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_20"
-                android:text="183XXXX5400 | -人"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/dp_28"
-                app:layout_constraintLeft_toLeftOf="@+id/taskStatus"
-                app:layout_constraintTop_toBottomOf="@+id/taskStatus" />
-
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/pathwayPoint"
-                android:layout_width="@dimen/dp_478"
-                android:layout_height="@dimen/dp_68"
-                android:layout_marginTop="@dimen/dp_30"
-                android:background="@drawable/task_pathway_point_bg"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:paddingLeft="@dimen/dp_36"
-                android:text="途径: "
-                android:textColor="@color/station_tag_color"
-                android:textSize="@dimen/dp_32"
-                android:visibility="gone"
-                app:layout_constraintLeft_toLeftOf="@+id/taskStatus"
-                app:layout_constraintTop_toBottomOf="@+id/orderPhoneAndNum"
-                app:layout_goneMarginTop="@dimen/dp_40" />
-
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/startStationTag"
                 android:layout_width="wrap_content"
@@ -154,7 +152,7 @@
                 android:textColor="@color/station_tag_color"
                 android:textSize="@dimen/dp_32"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pathwayPoint"
+                app:layout_constraintTop_toBottomOf="@+id/taskHintTextView"
                 app:layout_goneMarginTop="@dimen/dp_68" />
 
             <com.mogo.och.common.module.wigets.MarqueeTextView
@@ -175,9 +173,10 @@
                 android:id="@+id/naviToStart"
                 android:layout_width="@dimen/dp_48"
                 android:layout_height="@dimen/dp_48"
+                android:layout_marginEnd="@dimen/dp_40"
                 android:src="@drawable/taxi_navi_icon"
                 app:layout_constraintBottom_toBottomOf="@id/startStationName"
-                app:layout_constraintRight_toRightOf="@+id/cancelOrder"
+                app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/startStationName"
                 app:layout_goneMarginEnd="@dimen/dp_40" />
 
@@ -185,9 +184,10 @@
                 android:id="@+id/naviToEnd"
                 android:layout_width="@dimen/dp_48"
                 android:layout_height="@dimen/dp_48"
+                android:layout_marginEnd="@dimen/dp_40"
                 android:src="@drawable/taxi_navi_icon"
                 app:layout_constraintBottom_toBottomOf="@id/endStationName"
-                app:layout_constraintRight_toRightOf="@+id/cancelOrder"
+                app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/endStationName"
                 app:layout_goneMarginEnd="@dimen/dp_40" />
 
@@ -216,14 +216,13 @@
                 app:layout_constraintLeft_toLeftOf="@+id/startStationTag"
                 app:layout_constraintTop_toBottomOf="@+id/endStationTag" />
 
-
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/startPoint"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/taxi_driver_circle_green_big"
                 app:layout_constraintBottom_toBottomOf="@+id/startStationName"
-                app:layout_constraintLeft_toLeftOf="@+id/taskStatus"
+                app:layout_constraintLeft_toLeftOf="@+id/taskHintTextView"
                 app:layout_constraintTop_toTopOf="@+id/startStationName" />
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -243,22 +242,21 @@
                 android:layout_height="wrap_content"
                 android:src="@drawable/taxi_driver_circle_blue_big"
                 app:layout_constraintBottom_toBottomOf="@+id/endStationName"
-                app:layout_constraintLeft_toLeftOf="@+id/taskStatus"
+                app:layout_constraintLeft_toLeftOf="@+id/taskHintTextView"
                 app:layout_constraintTop_toTopOf="@+id/endStationName" />
 
-
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/taskOtherInfo"
+                android:id="@+id/taskTripInfo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_30"
                 android:layout_marginBottom="36dp"
                 android:text="距离 -- 公里, 用时 -- 分钟"
                 android:textColor="@color/station_tag_color"
                 android:textSize="@dimen/dp_30"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="@+id/taskStatus"
-                app:layout_goneMarginBottom="@dimen/dp_172" />
-
+                app:layout_constraintLeft_toLeftOf="@+id/endStationName"
+                app:layout_constraintTop_toBottomOf="@+id/endStationName" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
@@ -266,6 +264,7 @@
             layout="@layout/routing_no_data_common_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:visibility="visible"
             app:layout_constraintBottom_toTopOf="@+id/bottomBtnContainer"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"

OCH/taxi/unmanned-driver/src/main/res/values/strings.xml

@@ -61,6 +61,7 @@
     <string name="view_data">查看</string>
 
     <string name="routing_verify_btn_choose_task">选择任务</string>
+    <string name="routing_verify_btn_start_task">开始任务</string>
     <string name="routing_verify_choose_line_title">任务列表</string>
     <string name="routing_verify_choose_line_btn_txt">确认</string>
     <string name="routing_verify_choose_line_no_task">暂无任务</string>