From 4e7771400eb33e30073612a73a699ac9d3fd3280 Mon Sep 17 00:00:00 2001
From: bxb <baixiaobing@zhidaoauto.com>
Date: Fri, 17 Mar 2023 19:42:50 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E9=A9=BE=E9=A9=B6=E5=AD=90=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E7=82=B9=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/sweeper/model/SweeperTaskModel.java    | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
index 5182e28a36..12b9f07723 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
@@ -28,7 +28,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListener
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
-import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager;
 import com.mogo.och.common.module.biz.common.socketmessage.data.OCHOperationalMessage;
@@ -192,7 +191,7 @@ public class SweeperTaskModel {
 
         @Override
         public void onAutopilotRotting(MessagePad.GlobalPathResp routeList) {
-            if (null != routeList && routeList.getWayPointsList().size() > 0) {
+            if (null != routeList && routeList.getWayPointsList()!=null&&routeList.getWayPointsList().size() > 0) {
                 if (mCurrentSubTaskDetail.getLineId() != mLineId) {//判断是否同一条路线
                     mLineId = mCurrentSubTaskDetail.getLineId();
                     points.addAll(coordinateConverterWgsToGcjList(mContext, routeList.getWayPointsList()));
@@ -311,8 +310,6 @@ public class SweeperTaskModel {
             + ", mLatitude=" + gnssInfo.getLatitude() + ", mSubTaskType=" + mSubTaskType +", mIsSubTaskWorking=" + mIsSubTaskWorking
                     + ", isAutopilotSubTaskArriveEndSite=" + isAutopilotSubTaskArriveEndSite
             );
-            mLongitude = gnssInfo.getLongitude();
-            mLatitude = gnssInfo.getLatitude();
             if (mControllerStatusCallback != null) {
                 mControllerStatusCallback.onCarLocationChanged(gnssInfo);
             }
@@ -335,12 +332,10 @@ public class SweeperTaskModel {
     private void addCoordinates(MogoLocation mogoLatLng) {
         String tempLongitude = NumberFormatUtil.cutOutNumber(mogoLatLng.getLongitude(), 5);
         String tempLatitude = NumberFormatUtil.cutOutNumber(mogoLatLng.getLatitude(), 5);
-
-        String latitude = NumberFormatUtil.cutOutNumber(points.get(points.size()-1).latitude, 5);
-        String longitude = NumberFormatUtil.cutOutNumber(points.get(points.size()-1).longitude, 5);
-
         //用于过滤车是否停在原地，经纬度相同的情况
-        if (!tempLongitude.equals(longitude) && !tempLatitude.equals(latitude)) {
+        if (!tempLongitude.equals(mLongitude) && !tempLatitude.equals(mLatitude)) {
+            mLongitude = mogoLatLng.getLongitude();
+            mLatitude = mogoLatLng.getLatitude();
             SweeperRoutePlanningUpdateReqBean.Result result = new SweeperRoutePlanningUpdateReqBean.Result();
             result.latitude = mogoLatLng.getLatitude();
             result.longitude = mogoLatLng.getLongitude();