From c26dee779b729440eba824cebce9c71c4b42d98f Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 17 Nov 2022 14:32:04 +0800 Subject: [PATCH] =?UTF-8?q?[2.13.0]=20taxi=E8=AE=A2=E5=8D=95=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=8E=9F=E5=9B=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/constant/TaxiOrderCancelReasons.kt | 6 ++++++ .../com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt index be9f951a93..c55993eddf 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt @@ -12,6 +12,7 @@ package com.mogo.och.taxi.constant * 身体不适 3 * 乘客未到 4 * 乘客中途下车 5 + * 1099前都可用 * * 待服务订单： * 2000 车辆故障 @@ -27,6 +28,11 @@ enum class TaxiOrderCancelReasons(val type: Int, val msg: String) { DriverIsIll(1003, "身体不适"), PassengerNotArrive(1004, "乘客未到"), PassengerStopOver(1005, "乘客中途下车"), + PassengerCancel(1006, "乘客联系安全员取消"), + UnContractPassenger(1007, "联系不上乘客"), + JourneyConflict(1008, "行程冲突"), + StartStationFaraway(1009,"距离过远 无法接单"), + Other( 1010, "其他原因"), BookCarBroken(2000, "车辆故障"), BookPassengerCancel(2001, "乘客联系取消"), diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java index 5b0f8560a5..e40e1a7b9c 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java @@ -65,22 +65,27 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi switch (ochStatus) { case OnTheWayToStart: mContentArrays = new String[]{TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.DeviceBroken.getMsg(), - TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg()}; + TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg(), + TaxiOrderCancelReasons.StartStationFaraway.getMsg(), TaxiOrderCancelReasons.Other.getMsg(), + TaxiOrderCancelReasons.PassengerCancel.getMsg()}; break; case ArriveAtStart: mContentArrays = new String[]{TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.DeviceBroken.getMsg(), TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg(), - TaxiOrderCancelReasons.PassengerNotArrive.getMsg()}; + TaxiOrderCancelReasons.PassengerNotArrive.getMsg(),TaxiOrderCancelReasons.UnContractPassenger.getMsg(), + TaxiOrderCancelReasons.PassengerCancel.getMsg(),TaxiOrderCancelReasons.Other.getMsg()}; break; case OnTheWayToEnd: case ArriveAtEnd: mContentArrays = new String[]{TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.DeviceBroken.getMsg(), - TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg(), TaxiOrderCancelReasons.PassengerStopOver.getMsg()}; + TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg(), + TaxiOrderCancelReasons.PassengerStopOver.getMsg(),TaxiOrderCancelReasons.Other.getMsg()}; break; default: mContentArrays = new String[]{TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.DeviceBroken.getMsg(), TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg(), - TaxiOrderCancelReasons.PassengerNotArrive.getMsg(), TaxiOrderCancelReasons.PassengerStopOver.getMsg()}; + TaxiOrderCancelReasons.PassengerNotArrive.getMsg(), TaxiOrderCancelReasons.PassengerStopOver.getMsg(), + TaxiOrderCancelReasons.Other.getMsg()}; break; }