From 4d0e274c1dc6117a90123d879a9d8b75863bc160 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 3 Sep 2025 10:19:02 +0800 Subject: [PATCH] =?UTF-8?q?[8.2.0][opt]=E5=8E=BB=E6=8E=89=E8=A1=8C?= =?UTF-8?q?=E7=A8=8B=E6=80=BB=E8=A7=88=E7=9A=84=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/runing/other/TaskRunningView.kt | 4 +- .../weaknet/ui/taskrunning/TaskRunningView.kt | 4 +- .../itinerarycurrent/ItineraryCurrentView.kt | 42 +++++++++---------- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt index 4dc47ad675..c8749a38e8 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt @@ -30,7 +30,9 @@ import kotlinx.android.synthetic.main.biz_other_running.view.bus_task_running_li import kotlinx.android.synthetic.main.biz_other_running.view.loading_arrive_station import kotlinx.android.synthetic.main.biz_other_running.view.rl_running_task_station_list - +/** + * Bus接驳算路验证的任务 + */ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallback { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt index 4261edb5fe..74e291bfd4 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt @@ -27,7 +27,9 @@ import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.bus_task_ru import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.loading_arrive_station import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.rl_running_task_station_list - +/** + * OCH业务的任务 + */ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallback { 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 d0fb3162d7..5272cfaea4 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 @@ -132,7 +132,7 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi private var mPrepareTasCountDownTimer: CountDownTimer? = null - private var dialog: ItinerarySummaryDialog? = null +// private var dialog: ItinerarySummaryDialog? = null private var viewModel: ItineraryCurrentModel?=null private var viewModelSwitch: ItinerarySwitchModel?=null @@ -184,7 +184,7 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi // 全程距离和时间 is TaskWithOrderUIState.UpdateOrderTripInfo -> { - dialog?.setOrderMileage(taskAndOrderUiState.mileage*1000) +// dialog?.setOrderMileage(taskAndOrderUiState.mileage*1000) actv_distance_end.text = TaskUtils.getCurrentTaskDistance(taskAndOrderUiState.mileage.toLong()) + " "+ TaskUtils.getCurrentTaskTime(taskAndOrderUiState.duration.toLong()) } // 根据轨迹计算剩余距离和时间 @@ -899,30 +899,30 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi private fun showDialog(){ d(TAG,"showDialog") - if(dialog==null&&context!=null){ - - } - context?.let { - if(dialog==null) { - dialog = ItinerarySummaryDialog(it, true, R.style.summary_dialog) - } - dialog?.let { dialogInner -> - if(!dialogInner.isShowing){ - dialogInner.show() - } - } - } +// if(dialog==null&&context!=null){ +// +// } +// context?.let { +// if(dialog==null) { +// dialog = ItinerarySummaryDialog(it, true, R.style.summary_dialog) +// } +// dialog?.let { dialogInner -> +// if(!dialogInner.isShowing){ +// dialogInner.show() +// } +// } +// } } private fun dismissDialog(){ d(TAG,"dismissDialog") - dialog?.let { - if(it.isShowing){ - it.dismiss() - } - } - dialog = null +// dialog?.let { +// if(it.isShowing){ +// it.dismiss() +// } +// } +// dialog = null } private fun hideNaviBtns() {