From 3bf4f4ad76b5df0b418a3998c7e44b3f4d7159c3 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 22 Jan 2021 19:20:50 +0800
Subject: [PATCH] opt

---
 .idea/gradle.xml                                       |  1 -
 .../main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java  |  2 ++
 .../java/com/mogo/och/taxi/ui/OCHTaxiFragment.java     | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 740794bd48..771c1f74d7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -89,7 +89,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
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 563001cafc..3fa450c83d 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
@@ -237,6 +237,7 @@ class MogoOCHTaxiModel {
 
         @Override
         public void onCarLocationChanged2( Location location ) {
+            Logger.d( TAG, "定位已判断是否达到上车站点" );
             onLocationChanged( location );
         }
 
@@ -431,6 +432,7 @@ class MogoOCHTaxiModel {
                     OCHTaxiUiController.getInstance().removeFragment();
                     break;
                 case UserArriveAtStartStation:
+                    mIsArriveAtStartStation = true;
                     mIsUserArriveAtStartStation = true;
                     OCHTaxiUiController.getInstance().onUserArriveAtStartStation();
                     break;
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 c074336541..89c15ecbf8 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
@@ -126,11 +126,11 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
         } else if ( MogoOCHTaxiModel.getInstance().isArriveAtStartStation() ) {
             Logger.d( TAG, "已经达到起点" );
             mOrderStatus.setText( "已到达上车地点，等待乘客上车" );
-        } else if ( MogoOCHTaxiModel.getInstance().isUserArriveAtStartStation() ) {
-            Logger.d( TAG, "乘客已上车" );
-            slidePanelView.setVisibility( View.VISIBLE );
-            slidePanelView.setText( getString( R.string.module_och_taxi_arrive_at_start_station ) );
-            mOrderStatus.setText( "已到达上车地点，等待乘客上车" );
+            if ( MogoOCHTaxiModel.getInstance().isUserArriveAtStartStation() ) {
+                Logger.d( TAG, "乘客已上车" );
+                slidePanelView.setVisibility( View.VISIBLE );
+                slidePanelView.setText( getString( R.string.module_och_taxi_arrive_at_start_station ) );
+            }
         } else if ( MogoOCHTaxiModel.getInstance().checkCurrentOCHOrder() ) {
             Logger.d( TAG, "去往上车站点" );
             slidePanelView.setVisibility( View.GONE );