From 53fae7f714b8a79b16baca8ab11bebb3658b2c11 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 6 Dec 2022 14:07:37 +0800
Subject: [PATCH] [2.13.0] taxi/bus onLocationChanged location null

---
 .../com/mogo/och/bus/passenger/model/BusPassengerModel.java    | 1 +
 .../src/main/java/com/mogo/och/bus/model/BusOrderModel.java    | 1 +
 .../java/com/mogo/och/sweeper/model/SweeperOrderModel.java     | 1 +
 .../com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java  | 3 ++-
 .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java       | 3 ++-
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index ae69e9f648..761673ec27 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -297,6 +297,7 @@ public class BusPassengerModel {
     private final IMoGoMapLocationListener mMapLocationListener = new IMoGoMapLocationListener() {
         @Override
         public void onLocationChanged(@Nullable MogoLocation location, int from, boolean isGps) {
+            if (null == location) return;
             mLocation = location;
             for (IBusPassengerControllerStatusCallback callback :mControllerStatusCallbackMap.values()){
                 callback.onCarLocationChanged(location);
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
index 0b1eb2c647..e46780606e 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
@@ -382,6 +382,7 @@ public class BusOrderModel {
     private final IMoGoMapLocationListener mMapLocationListener = new IMoGoMapLocationListener() {
         @Override
         public void onLocationChanged(@Nullable MogoLocation location, int from, boolean isGps) {
+            if (null == location) return;
             mLongitude = location.getLongitude();
             mLatitude = location.getLatitude();
             if (mControllerStatusCallback != null) {
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
index f95034ce34..58d0d8f426 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
@@ -289,6 +289,7 @@ public class SweeperOrderModel {
     private final IMoGoMapLocationListener mMapLocationListener = new IMoGoMapLocationListener() {
         @Override
         public void onLocationChanged(@Nullable MogoLocation location, int from, boolean isGps) {
+            if (null == location) return;
             mLongitude = location.getLongitude();
             mLatitude = location.getLatitude();
             if (mControllerStatusCallback != null) {
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
index 0fe9c85f35..3deddb2caf 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
@@ -452,7 +452,8 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
         @Override
         public void onLocationChanged(@Nullable MogoLocation location, int from, boolean isGps) {
             //位置变化时，通过围栏判断是否到达x点
-            if (location != null && checkCurrentOCHOrder()) {
+            if (null == location) return;
+            if (checkCurrentOCHOrder()) {
                 if (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.OnTheWayToEnd) {
                     calculateTravelDistance(location);
                 }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 6184a1c946..dffd5fd7bb 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -1056,7 +1056,8 @@ public class TaxiModel {
         @Override
         public void onLocationChanged(@Nullable MogoLocation location, int from, boolean isGps) {
             //位置变化时，通过围栏判断是否到达x点
-            if (location != null && checkCurrentOCHOrder()) {
+            if (null == location) return;
+            if (checkCurrentOCHOrder()) {
                 if (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToStart) {
                     judgeStartStation(location);
                 }