From fdd25147c351e0b85fa5c20c719a33a045d95b26 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Wed, 3 Feb 2021 10:53:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/taxi/MogoOCHTaxiModel.java    | 13 +++++++++----
 1 file changed, 9 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 c1d073b6ef..491b8ad8fd 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
@@ -246,6 +246,11 @@ class MogoOCHTaxiModel {
         } );
     }
 
+    /**
+     * 将查询到的订单转换成推送的订单数据，目前两者数据结构不一样
+     *
+     * @param data
+     */
     private void convertCurrentOrder( OCHTaxiOrderResponse2 data ) {
         if ( mCurrentOCHOrder == null ) {
             mCurrentOCHOrder = new OCHTaxiOrderResponse();
@@ -306,7 +311,7 @@ class MogoOCHTaxiModel {
     }
 
     /**
-     * 位置变化时，通过围栏（5M）判断，是否到达x点
+     * 位置变化时，通过围栏（{@link #ARRIVE_AT_START_STATION_DISTANCE}M）判断，是否到达x点
      *
      * @param location
      */
@@ -325,16 +330,16 @@ class MogoOCHTaxiModel {
             unregisterCarLocationListener();
             return;
         }
-        judgeStationStation( location );
+        judgeStartStation( location );
     }
 
 
     /**
-     * 是否到达起点
+     * 根据围栏判断，是否到达起点
      *
      * @param location
      */
-    private void judgeStationStation( Location location ) {
+    private void judgeStartStation( Location location ) {
         OCHTaxiOrderResponse.OCHTaxiStation station = mCurrentOCHOrder.drivingRoutes.get( 0 );//起点
         double distance = CoordinateUtils.calculateLineDistance( station.lon, station.lat, location.getLongitude(), location.getLatitude() );
         if ( distance > ARRIVE_AT_START_STATION_DISTANCE ) {