From 8c23dbe41172d95ca8549828b01517b12d419ac0 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 26 May 2022 19:02:04 +0800 Subject: [PATCH] =?UTF-8?q?[taxi/bus-d=20270]=20taxi=20=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E8=B0=83=E8=AF=95=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/network/TaxiPassengerServiceManager.java | 4 ++-- .../main/java/com/mogo/och/taxi/model/TaxiModel.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java index 0e47bb6c92..8f319e12b6 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java @@ -52,8 +52,8 @@ public class TaxiPassengerServiceManager { * @return */ private String getDriverAppSn(){ - return CallerTelematicManager.INSTANCE.getServerToken(); -// return "X2020210525EFA93B5946FA38D4"; +// return CallerTelematicManager.INSTANCE.getServerToken(); + return "X2020220425Q466X1F"; } /** diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 58bd868e17..d4a8b77bfa 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1011,11 +1011,11 @@ public class TaxiModel { * 订单流转debug START */ public void setArriveAtStartStation() { -// if (mCurrentOCHOrder == null -// || mCurrentOCHOrder.orderStatus != TaxiOrderStatusEnum.OnTheWayToStart.getCode()) { -// TipToast.shortTip("订单状态不匹配该操作！"); -// return; -// } + if (mCurrentOCHOrder == null + || mCurrentOCHOrder.orderStatus != TaxiOrderStatusEnum.OnTheWayToStart.getCode()) { + TipToast.shortTip("订单状态不匹配该操作！"); + return; + } updateOCHOrderStatus(TaxiOrderStatusEnum.ArriveAtStart); }