From c58a0662430b096478510795b4ba47b9e1e5510a Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 24 May 2023 17:58:51 +0800
Subject: [PATCH] =?UTF-8?q?[3.2.0]=20=E4=BC=98=E5=8C=96M2=E4=B9=98?=
 =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E9=87=8C=E7=A8=8B=E8=AE=A1=E7=AE=97=E5=92=8C?=
 =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E8=8E=B7=E5=8F=96=E8=BD=A8=E8=BF=B9=E6=97=B6?=
 =?UTF-8?q?=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/data/bean/BusStationBean.java    |  2 +-
 .../mogo/och/bus/passenger/model/PM2DrivingModel.kt    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java b/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java
index 20baf93478..12fac3ad93 100644
--- a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java
+++ b/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java
@@ -109,7 +109,7 @@ public class BusStationBean {
                 && drivingStatus == that.drivingStatus
                 && leaving == that.leaving
                 && name.equals(that.name)
-                && nameKr.equals(that.nameKr);
+                && (nameKr == null || nameKr.equals(that.nameKr));
     }
 
     @Override
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
index af838acb50..6b7572c338 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
@@ -267,7 +267,11 @@ class PM2DrivingModel private constructor() {
             .coordinateConverterWgsToGcjLocations(mContext, routePoints)
         d(SceneConstant.M_BUS_P + TAG, "och-rotting==latLngModels = " + latLngModels.size)
         mRoutePoints.addAll(latLngModels)
-        calculateTwoStationsRoute()
+
+        if (isGoingToNextStation){
+            mTwoStationsRouts.clear()
+            startRemainRouteInfo()
+        }
     }
 
     private fun updateSpeed(mogoLocation: MogoLocation) {
@@ -497,6 +501,10 @@ class PM2DrivingModel private constructor() {
     }
 
     fun dynamicCalculateRouteInfo(){
+        //如果轨迹点为空发送一次获取轨迹指令
+        if (mRoutePoints.size == 0){
+            CallerAutoPilotControlManager.getGlobalPath()
+        }
         //计算当前位置和下一站的剩余点集合
         //计算剩余点总里程和时间
         d(SceneConstant.M_BUS_P + TAG, "och-rotting==mTwoStationsRouts.size() = " + mTwoStationsRouts.size)