From ad8478a7202919fe54eb6b5fb9df8a04f5ab959b Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@gmail.com>
Date: Sat, 18 Mar 2023 13:24:34 +0800
Subject: [PATCH] =?UTF-8?q?[M1]=20[=E8=BD=A8=E8=BF=B9=E8=AE=A1=E7=AE=97]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/model/CharterPassengerModel.kt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index c62c6dc1e4..fedfe4f303 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -633,9 +633,17 @@ object CharterPassengerModel {
             )
             //要前往的站在轨迹中对应的点
             var nextRouteIndex: Int = mRoutePoints.size - 1
-            orderInfo?.let {
+            orderInfo?.let {order->
+                val coordinateConverterWgsToGcj =
+                    CoordinateCalculateRouteUtil.coordinateConverterWgsToGcj(
+                        mContext,
+                        order.wgs84Lon!!,
+                        order.wgs84Lat!!
+                    )
                 nextRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew(
-                    currentRouteIndex, mRoutePoints, it.gcj02Lon!!, it.gcj02Lat!!
+                    currentRouteIndex, mRoutePoints,
+                    coordinateConverterWgsToGcj.longitude,
+                    coordinateConverterWgsToGcj.latitude
                 )
             }
             var lastSumLength = 0f