From 3e65313d41c62b046b1b55384c6328c7647affa5 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Thu, 30 Apr 2020 16:16:25 +0800
Subject: [PATCH] opt

---
 .../module/extensions/entrance/EntranceFragment.java  |  1 +
 .../mogo/module/service/marker/MapMarkerManager.java  | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 9efbf00fbd..e5aeabede9 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -516,6 +516,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
                 mUpload.setVisibility( View.GONE );
                 if ( mUploadFrameAnimHandler != null ) {
                     mUploadFrameAnimHandler.removeMessages( MSG_STOP_ANIM );
+                    mUploadFrameAnimHandler.removeMessages( MSG_FRAME_ANIM );
                 }
                 doFrameAnimOnUploadButton();
             } else {
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index 4b715310ed..0be6a1e98a 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -903,7 +903,9 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
     private void startSmooth(IMogoMarker iMogoMarker, MarkerOnlineCar markerOnlineCar,
                              MarkerLocation markerLocation) {
         List< MarkerCarPois > poiList = markerOnlineCar.getPois();
-        filterErrorPoint( poiList );
+        if ( filterErrorPoint( poiList ) ) {
+            return;
+        }
         if ( poiList == null || poiList.size() < 2 ) {
             return;
         }
@@ -931,9 +933,9 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
      * 有可能出现终点到起点跳跃的情况，需要用"500M"约束起点和终点
      * @param poiList
      */
-    private void filterErrorPoint(List< MarkerCarPois > poiList){
+    private boolean filterErrorPoint(List< MarkerCarPois > poiList){
         if ( poiList == null || poiList.size() < 2 ) {
-            return;
+            return false;
         }
         MarkerCarPois start = poiList.get( 0 );
         MarkerCarPois end = poiList.get( poiList.size() - 1 );
@@ -944,10 +946,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
             double lat2 = Double.valueOf( end.getCoordinates().get( 1 ) + "" );
             double lng2 = Double.valueOf( end.getCoordinates().get( 0 ) + "" );
             if ( Utils.calculateLineDistance( new MogoLatLng( lat1, lng1 ), new MogoLatLng( lat2, lng2 ) ) >= 500 ) {
-                poiList.remove( poiList.size() - 1 );
+                return true;
             }
         } catch ( Exception e ) {
         }
+        return false;
     }
 
     private boolean ignoreDrawRequest() {