From 997c5769cff458c8dc7017efad788b9d9b04671f Mon Sep 17 00:00:00 2001 From: aibingbing Date: Thu, 30 Nov 2023 19:26:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=87=AA=E4=B8=BB=E7=AE=97=E8=B7=AF=E9=AA=8C?= =?UTF-8?q?=E8=AF=81]=20fix:=20=E7=BB=93=E6=9D=9F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=B6=20taskId=E5=80=BC=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/ui/routing/TaxiRoutingFragment.kt | 66 +++++++++---------- 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt index 038ca5f52d..6b0d2bfccb 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt @@ -145,7 +145,7 @@ class TaxiRoutingFragment : BaseFragment(), ICommonNaviChangedCallback { naviToStart.visibility = View.VISIBLE naviToEnd.visibility = View.INVISIBLE updateStartAndEndStationPointByStatus(false) - updateCurrentTaskTripInfo(0,0) + updateCurrentTaskTripInfo(0, 0) data.grayLineBean?.startSite?.also { initStartNaviToStationParam( @@ -184,7 +184,7 @@ class TaxiRoutingFragment : BaseFragment(), ICommonNaviChangedCallback { naviToStart.visibility = View.INVISIBLE naviToEnd.visibility = View.VISIBLE updateStartAndEndStationPointByStatus(true) - updateCurrentTaskTripInfo(0,0) + updateCurrentTaskTripInfo(0, 0) routingTask.grayLineBean?.endSite?.also { initStartNaviToStationParam( @@ -209,43 +209,37 @@ class TaxiRoutingFragment : BaseFragment(), ICommonNaviChangedCallback { } private fun showFeedbackDialog(grayId: Long) { - if (mFeedbackDialog == null) { - val builder: TaxiRoutingFeedbackDialog.Builder = TaxiRoutingFeedbackDialog.Builder() - builder.cancelStr( - MainMoGoApplication.getApp() - .getString(R.string.routing_feedback_result_btn_not_sure) - ).confirmStr( - MainMoGoApplication.getApp() - .getString(R.string.routing_feedback_result_btn_sure) - ).tips(MainMoGoApplication.getApp().getString(R.string.routing_feedback_result_hint)) - .clickListener(object : - TaxiRoutingFeedbackDialog.TaxiRoutingFeedBackDialogClickListener { - override fun confirm() { - mViewModel.sendUiIntent( - TaxiRoutingUiIntent.SubmitEndTask( - grayId, - EndGrayTaskFeedbackType.USABLE_YES - ) + val builder: TaxiRoutingFeedbackDialog.Builder = TaxiRoutingFeedbackDialog.Builder() + builder.cancelStr( + MainMoGoApplication.getApp() + .getString(R.string.routing_feedback_result_btn_not_sure) + ).confirmStr( + MainMoGoApplication.getApp() + .getString(R.string.routing_feedback_result_btn_sure) + ).tips(MainMoGoApplication.getApp().getString(R.string.routing_feedback_result_hint)) + .clickListener(object : + TaxiRoutingFeedbackDialog.TaxiRoutingFeedBackDialogClickListener { + override fun confirm() { + mViewModel.sendUiIntent( + TaxiRoutingUiIntent.SubmitEndTask( + grayId, + EndGrayTaskFeedbackType.USABLE_YES ) - } + ) + } - override fun cancel() { - mViewModel.sendUiIntent( - TaxiRoutingUiIntent.SubmitEndTask( - grayId, - EndGrayTaskFeedbackType.USABLE_NO - ) + override fun cancel() { + mViewModel.sendUiIntent( + TaxiRoutingUiIntent.SubmitEndTask( + grayId, + EndGrayTaskFeedbackType.USABLE_NO ) - } - }) - activity?.also { - mFeedbackDialog = builder.build(it) - mFeedbackDialog?.showDialog() - } - } else { - activity?.also { - mFeedbackDialog?.showDialog() - } + ) + } + }) + activity?.also { + mFeedbackDialog = builder.build(it) + mFeedbackDialog?.showDialog() } }