From 3ed5fbf31c0c492d74517ffc86518c405786f474 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 8 May 2024 12:26:36 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[fix]=20[=E5=9F=BA=E7=A1=80=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9C=AA=E5=B0=B1=E7=BB=AA]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/shuttle/model/OrderModel.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java
index 86ee66ec22..301996838f 100644
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java
@@ -492,6 +492,10 @@ public class OrderModel {
      */
     public void abortTask() {
         CallerLogger.d(M_BUS + TAG, "结束当前路线abortTask");
+        if(busRoutesResult==null){
+            ToastUtils.showLong("数据异常、请稍后再试");
+            return;
+        }
         OrderServiceManager.abortTask(mContext, busRoutesResult.getTaskId()
                 , new OchCommonServiceCallback<BaseData>() {
                     @Override
@@ -816,6 +820,10 @@ public class OrderModel {
      */
     public void leaveStation() {
         CallerLogger.d(M_BUS + TAG, "leaveStation-backgroundCurrentStationIndex = " + backgroundCurrentStationIndex);
+        if(busRoutesResult==null){
+            ToastUtils.showLong("数据异常、请稍后再试");
+            return;
+        }
         String nextStationName = "";
         String nextStationNameKr = "";
         MogoLocation nextStationPoint = new MogoLocation();