[M1]

[轨迹计算]

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