From 4de208026af2cb475849189e77ce6216402512b3 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Tue, 23 Feb 2021 15:21:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=B4=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 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 491b8ad8fd..ddb089d00c 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
@@ -300,7 +300,12 @@ class MogoOCHTaxiModel {
 
         @Override
         public void onCarLocationChanged2( Location location ) {
-            Logger.d( TAG, "定位已判断是否达到上车站点" );
+            Logger.d( TAG, "定位已判断是否达到上车站点: 起点(%s, %s), 当前位置(%s, %s)",
+                    mCurrentOCHOrder.drivingRoutes.get( 0 ).lon,
+                    mCurrentOCHOrder.drivingRoutes.get( 0 ).lat,
+                    location.getLongitude(),
+                    location.getLatitude()
+            );
             onLocationChanged( location );
         }
 
@@ -323,11 +328,9 @@ class MogoOCHTaxiModel {
             return;
         }
         if ( mIsArriveAtStartStation ) {
-            unregisterCarLocationListener();
             return;
         }
         if ( mIsUserArriveAtStartStation ) {
-            unregisterCarLocationListener();
             return;
         }
         judgeStartStation( location );
@@ -349,7 +352,6 @@ class MogoOCHTaxiModel {
         }
         if ( distance <= ARRIVE_AT_START_STATION_DISTANCE ) {
             mIsArriveAtStartStation = true;
-            unregisterCarLocationListener();
             OCHTaxiUiController.getInstance().onArriveAtStartStation();
             updateOCHOrderStatus( OCHOrderStatus.ArriveAtStartStation, new OCHOrderStatusCallback() {
                 @Override
@@ -685,6 +687,7 @@ class MogoOCHTaxiModel {
                     .getAdasControllerApi()
                     .cancelAutopilot();
             Logger.d( TAG, "结束自动驾驶" );
+            unregisterCarLocationListener();
         } catch ( Exception e ) {
             e.printStackTrace();
         }