From 604dd938c112e498737e3fc06e59f818b725899c Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Sun, 18 Jul 2021 15:30:03 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"taxi=203=E7=A7=92=E8=BD=AE=E8=AF=A2?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=20=20=E7=BC=93=E8=A7=A3=E9=95=BF=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E5=BC=82=E5=B8=B8=20=20=E8=B0=83=E6=95=B4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E5=88=87=E6=8D=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?,=E5=AE=8C=E5=85=A8=E4=BB=8E=E6=9C=8D=E5=8A=A1=E7=AB=AF?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit eee19baf
---
 .../src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java   | 6 +++---
 .../src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java | 6 +++---
 OCH/mogo-och-taxi/src/main/res/values/strings.xml           | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
index cf451c134a..1ded643d76 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
@@ -489,8 +489,8 @@ class MogoOCHTaxiModel {
             updateOCHOrderStatus( OCHOrderStatus.ArriveAtStartStation, new OCHOrderStatusCallback() {
                 @Override
                 public void onSuccess( Object data ) {
-//                    OCHTaxiUiController.getInstance().onOrderStatusChanged(OCHOrderStatus.ArriveAtStartStation.getCode());
-//                    Logger.d( TAG, "更新状态成功" );
+                    OCHTaxiUiController.getInstance().onOrderStatusChanged(OCHOrderStatus.ArriveAtStartStation.getCode());
+                    Logger.d( TAG, "更新状态成功" );
                 }
 
                 @Override
@@ -853,7 +853,7 @@ class MogoOCHTaxiModel {
         }
     }
 
-    private static final int PERIOD = 3000;
+    private static final int PERIOD = 3 * 1000;
     private static final int DELAY = 100;
     private Disposable mDisposable;
     /**
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
index 34dea5c9c6..428524960f 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
@@ -232,7 +232,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
             @Override
             public void onSuccess( Object data ) {
                 Logger.d( TAG, "更新状态成功" );
-//                onOrderStatusChanged(OCHOrderStatus.ArriveAtEndStation.getCode());
+                onOrderStatusChanged(OCHOrderStatus.ArriveAtEndStation.getCode());
             }
 
             @Override
@@ -296,7 +296,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
                     Logger.d( TAG, "更新状态成功" );
                     MogoOCHTaxiModel.getInstance().clearCurrentOCHOrder();
                     MogoOCHTaxiModel.getInstance().cancelAutopilot();
-//                    OCHTaxiUiController.getInstance().onOrderStatusChanged(0);
+                    OCHTaxiUiController.getInstance().onOrderStatusChanged(0);
                 }
 
                 @Override
@@ -336,7 +336,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
             @Override
             public void onSuccess( Object data ) {
                 Logger.d( TAG, "更新状态成功" );
-//                onOrderStatusChanged(OCHOrderStatus.OnTheWayToEndStation.getCode());
+                onOrderStatusChanged(OCHOrderStatus.OnTheWayToEndStation.getCode());
             }
 
             @Override
diff --git a/OCH/mogo-och-taxi/src/main/res/values/strings.xml b/OCH/mogo-och-taxi/src/main/res/values/strings.xml
index 32d6040772..edb1423ef5 100644
--- a/OCH/mogo-och-taxi/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="module_och_taxi_arrive_at_start_station">确认上车，行程开始</string>
     <string name="module_och_taxi_arrive_at_end_station">到达站点，乘客已下车</string>
-    <string name="module_och_taxi_order_status_ph_text">已到达上车地点，等待乘客上车</string>
+    <string name="module_och_taxi_order_status_ph_text">已到达上车站点，等待乘客上车</string>
     <string name="module_och_taxi_order_distance_anchor_text">预计里程</string>
     <string name="module_och_taxi_order_distance_text_ph">3.2 km</string>
     <string name="module_och_taxi_order_complete">请携带好随身物品，注意侧后\n方来车，感谢体验蘑菇智行自\n动驾驶车！</string>