From 2934df3b459594b77adbfeb1dd7515894501ae1c Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 17 Nov 2022 17:03:32 +0800 Subject: [PATCH] =?UTF-8?q?[2.13.0]=20taxi=E5=A2=9E=E5=8A=A0=E9=80=81?= =?UTF-8?q?=E9=A9=BE=E9=80=94=E4=B8=AD=E7=BB=93=E6=9D=9F=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/presenter/TaxiPresenter.java | 5 +++ .../ui/TaxiBeingServerdOrdersFragment.java | 34 ++++++++++++++++--- .../com/mogo/och/taxi/ui/TaxiFragment.java | 4 +++ .../src/main/res/values/strings.xml | 7 ++++ 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java index ee9f9322e9..46410c4b48 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java @@ -191,6 +191,11 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS public void reportToEndDisAndTime(long lastSumLength, long duration){//米/秒 TaxiModel.getInstance().reportOrderRemain(lastSumLength,duration); } + + public void closeOrderByMan(){ + TaxiModel.getInstance().arriveTerminal(); + } + @Override public void onAutopilotArriveEnd() { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java index db6e275a06..4b9a4a4c80 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java @@ -34,6 +34,7 @@ import com.mogo.och.common.module.utils.DateTimeUtil; import com.mogo.och.common.module.utils.NumberFormatUtil; import com.mogo.och.common.module.utils.OCHThreadPoolManager; import com.mogo.och.common.module.voice.VoiceNotice; +import com.mogo.och.common.module.wigets.OCHCommitDialog; import com.mogo.och.taxi.constant.TaxiConst; import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; import com.mogo.och.taxi.R; @@ -218,11 +219,10 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment mContentModule2.setVisibility(View.VISIBLE); mOrderStatus.setText(R.string.module_och_taxi_on_the_way_2_end_station); - updateOrderBottomBtn(getString(R.string.module_och_taxi_order_server_end), - Color.parseColor("#4DFFFFFF"), - Color.parseColor("#4D1D5EF3"), - false); - + updateOrderBottomBtn(getString(R.string.module_och_taxi_order_close), + Color.parseColor("#FFFFFF"), + Color.parseColor("#FF1D5EF3"), + true); mTitleTV2.setText("送乘客至"); mStationTv2.setText(order.endSiteAddr); } else if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus @@ -450,9 +450,33 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment }else if (TaxiOrderStatusEnum.ArriveAtEnd.getCode() == mCurrentOrder.orderStatus) {//点击了完成服务，结束订单并更新订单信息 mTaxiFragment.completeOrderService(); //VoiceNotice.showNotice(getResources().getString(R.string.module_och_taxi_order_server_completed_tip)); + }else if (TaxiOrderStatusEnum.OnTheWayToEnd.getCode() == mCurrentOrder.orderStatus){//前往目的地过程中可提前结束行程 + closeOrderDialog(); } } + private void closeOrderDialog() { + OCHCommitDialog.Builder builder = new OCHCommitDialog.Builder(); + OCHCommitDialog closeOrderDialog = builder + .title(getString(R.string.dialog_order_close_title)) + .tips(getString(R.string.dialog_order_close_content)) + .confirmStr(getString(R.string.dialog_order_close_confirm)) + .cancelStr(getString(R.string.dialog_order_close_cancel)) + .build(getContext()); + closeOrderDialog.setClickListener(new OCHCommitDialog.ClickListener() { + @Override + public void confirm() { + if (mTaxiFragment != null) mTaxiFragment.closeOrderByMan(); + } + + @Override + public void cancel() { + closeOrderDialog.dismiss(); + } + }); + closeOrderDialog.show(); + } + public void onOrderStatusChanged(OrderQueryRespBean.Result order) { int status = order.orderStatus; CallerLogger.INSTANCE.d(M_TAXI + TAG, "status==" + status); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java index 056ed4c921..421312c280 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java @@ -322,6 +322,10 @@ public class TaxiFragment extends BaseTaxiTabFragment等待乘客开始行程 请等待乘客启动自动驾驶，或您自行启动 服务完成 + 结束行程 + + 提示 + 您确认要结束行程吗 + 确认 + 取消 + 自动驾驶状态为0不可用 司机端未确认可以开启自动驾驶