[8.2.0][opt]去掉行程总览的弹窗
This commit is contained in:
@@ -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 {
|
||||
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user