From d1b35debb3980860d5ed20b6b3caf3c42b3a02ed Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 21 Jun 2023 10:37:35 +0800
Subject: [PATCH] =?UTF-8?q?[3.3.0]=20[feature]=20[=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E5=BC=95=E8=B5=B7=E7=9A=84=E5=A4=9A=E7=BA=BF=E7=A8=8B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/passenger/model/BusPassengerModel.java    | 3 +++
 .../com/mogo/och/bus/passenger/model/BusPassengerModel.java    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index 417304b26e..7541b3ff1b 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -568,6 +568,9 @@ public class BusPassengerModel {
         if (mTwoStationsRouts.size() > 0 && mLocation != null) {
             Map<Integer, List<MogoLocation>> lastPointsMap = CoordinateCalculateRouteUtil
                     .getRemainPointListByCompareNew(mPreRouteIndex, mTwoStationsRouts, mLocation);
+            if(lastPointsMap==null){
+                return;
+            }
             for (int index : lastPointsMap.keySet()) {
                 mPreRouteIndex = index;
                 break;
diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index 9ca46de505..f5d44b6bbd 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -620,6 +620,9 @@ public class BusPassengerModel {
         if (mTwoStationsRouts.size() > 0 && mLocation != null){
             Map<Integer,List<MogoLocation>> lastPointsMap = CoordinateCalculateRouteUtil
                     .getRemainPointListByCompareNew(mPreRouteIndex,mTwoStationsRouts,mLocation);
+            if(lastPointsMap==null){
+                return;
+            }
             for (int index: lastPointsMap.keySet()) {
                  mPreRouteIndex = index;
                 break;