From a0ccd5467a0b7cae5df063ade76088fe5a5796e9 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 30 Dec 2024 18:24:35 +0800 Subject: [PATCH] =?UTF-8?q?[6.9.0]=20[fea]=20[taxi]=20[=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E5=88=B0=E8=BE=BE=E5=87=BA=E8=BD=A6=E7=82=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/unmanned/taxi/ui/task/TaxiTaskModel.kt | 2 +- .../itinerarycurrent/ItineraryCurrentModel.kt | 4 ++++ .../itinerarycurrent/ItineraryCurrentView.kt | 9 +++++++++ .../res/layout/unmanned_itinerary_current.xml | 16 ++++++++++++++++ .../src/main/res/values/strings.xml | 1 + 5 files changed, 31 insertions(+), 1 deletion(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index 64b9420e48..bf7df68456 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/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() { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt index a623be95ff..1622010419 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt @@ -532,6 +532,10 @@ class ItineraryCurrentModel : BaseViewModel(), }) } + fun arriveCalibrationSite() { + TaxiTaskModel.mockArriveAtNearestStation() + } + interface SwtichLineViewCallback { fun onStartTaskFail() diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt index fdfe62a1d8..e4d8b14e90 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt +++ b/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 diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml index 4a4a29e437..7f35be261d 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml +++ b/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" /> + + 请等待乘客启动自动驾驶，或您自行启动 服务完成 结束行程 + 到站 提示 您确认要结束行程吗