[6.9.0]

[fea]
[taxi]
[手动到达出车点]

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt

@@ -1416,7 +1416,7 @@ object TaxiTaskModel {
             ToastUtils.showShort("无虚拟站点！")
             return
         }
-        submitArriveSite(mDriveToNearestStationTask!!.siteId, false)
+        submitArriveSite(mDriveToNearestStationTask!!.siteId, false,true)
     }
 
     fun mockArriveAtEndStation() {

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt

@@ -532,6 +532,10 @@ class ItineraryCurrentModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
             })
     }
 
+    fun arriveCalibrationSite() {
+        TaxiTaskModel.mockArriveAtNearestStation()
+    }
+
 
     interface SwtichLineViewCallback {
         fun onStartTaskFail()

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt

@@ -75,6 +75,7 @@ import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.actv_order
 import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.orderPhoneAndNum
 // 运营单标识
 import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.aciv_task_type_order
+import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.actv_arriver_station
 import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.actv_switch_site
 // 取消订单
 import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.cancelOrder
@@ -243,6 +244,10 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
         actv_switch_site.onClick {
             viewModelSwitch?.switchSite()
         }
+        actv_arriver_station.onClick {
+            // 标定单到站
+            viewModel?.arriveCalibrationSite()
+        }
     }
 
     override fun onClick(v: View?) {
@@ -410,6 +415,7 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
         startStationName.text = resources.getString(R.string.task_current_loc)
         endStationName.text = driveToNearestStationTask.siteName
         aciv_task_type_exercise.setImageResource(R.drawable.taxi_task_calibration)
+        actv_arriver_station.visibility = View.VISIBLE
         actv_switch_site.visibility = View.VISIBLE
         naviToStart.visibility = GONE
         setOrRemoveMapMaker(
@@ -433,6 +439,7 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
         gourp_order.visibility = GONE
         aciv_task_type_exercise.visibility = GONE
         actv_switch_site.visibility = View.GONE
+        actv_arriver_station.visibility = View.GONE
         group_itinerary_info.visibility = GONE
         include_empty.visibility = VISIBLE
         prepareTaskCountdownTv.visibility = GONE
@@ -548,6 +555,7 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
             // 演练单标识
             aciv_task_type_exercise.visibility = View.GONE
             actv_switch_site.visibility = View.GONE
+            actv_arriver_station.visibility = View.GONE
             // 轨迹标识
             trajectoryType.visibility = View.GONE
             cancelTask.visibility = View.GONE
@@ -595,6 +603,7 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
         group_itinerary_info.visibility = View.VISIBLE
         aciv_task_type_exercise.visibility = View.GONE
         actv_switch_site.visibility = View.GONE
+        actv_arriver_station.visibility = View.GONE
 //                orderStatus: 0 订单创建（为派单）, 10 已派上司机（司机去往上车点）, 20 司机到达上车点,
 //                30 乘客到达上车点, 40 服务中（去往目的地）, 50 到达目的地, 60 已完成, 70 已取消
         naviToStart.visibility = if (order.orderStatus

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

@@ -258,6 +258,22 @@
         android:textColor="@color/taxi_submit_text_color_selector"
         android:textSize="@dimen/dp_40" />
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/actv_arriver_station"
+        android:layout_width="@dimen/dp_350"
+        android:layout_height="@dimen/dp_120"
+        app:pressed_enabled="false"
+        android:gravity="center"
+        android:text="@string/module_och_taxi_arrive_station"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginBottom="@dimen/dp_56"
+        android:background="@drawable/taxi_button_selector"
+        android:textColor="@color/taxi_submit_text_color_selector"
+        android:textSize="@dimen/dp_40" />
+
 
     <com.mogo.och.common.module.wigets.CommonSlideView
         android:id="@+id/commonSlideViewStartServer"

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

@@ -22,6 +22,7 @@
     <string name="module_och_taxi_order_choose_start_autopilot_tip">请等待乘客启动自动驾驶，或您自行启动</string>
     <string name="module_och_taxi_order_server_end">服务完成</string>
     <string name="module_och_taxi_order_close">结束行程</string>
+    <string name="module_och_taxi_arrive_station">到站</string>
 
     <string name="dialog_order_close_title">提示</string>
     <string name="dialog_order_close_content">您确认要结束行程吗</string>