From f2dfb4b2cb03abe4352772adda8b158632cef9b8 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Thu, 28 Nov 2024 19:15:04 +0800
Subject: [PATCH] =?UTF-8?q?[6.8.0][Fix]=E8=A7=A3=E5=86=B3=E8=A1=8C?=
 =?UTF-8?q?=E7=A8=8B=E5=85=A8=E8=A7=88=E8=B5=B7=E7=BB=88=E7=82=B9=E4=B8=8D?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/view/TravelRealityView.kt   | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt
index e6c1d08739..4a56ed9944 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt
@@ -379,6 +379,7 @@ class TravelRealityView @JvmOverloads constructor(
             }
         } else {
             clearPolyline()
+             clearSmallSites()
             hideSmallCarMarker()
             // 显示行程总览地图样式
             changeMapSettings(false)
@@ -1596,6 +1597,15 @@ class TravelRealityView @JvmOverloads constructor(
         }
     }
 
+    private fun clearSmallSites() {
+        UiThreadHandler.post {
+            smallSiteMarkerList?.forEach {
+                it.destroy()
+            }
+            smallSiteMarkerList = null
+        }
+    }
+
     private fun hideStartEndMarker() {
         if (mSmallStartMarker != null) {
             mSmallStartMarker!!.isVisible = false
@@ -1746,6 +1756,8 @@ class TravelRealityView @JvmOverloads constructor(
                 drawStartAndEnd(locList)
             }
         } else if (ochInfo.type == 1) {
+            mSmallSiteList = null
+            mSiteList.clear()
             val siteDataList = ochInfo.siteMarkerList
             val markerOptionsList: ArrayList<MarkerOptions> = ArrayList()
             siteDataList?.let { siteList ->
@@ -1764,7 +1776,7 @@ class TravelRealityView @JvmOverloads constructor(
                         )
                     )
                 }
-                mSmallSiteList = siteDataList
+                mSmallSiteList = siteList
             }
             if (!isPlayingAnim) {
                 drawSiteMarkers(markerOptionsList)
@@ -1842,12 +1854,7 @@ class TravelRealityView @JvmOverloads constructor(
     private fun drawSiteMarkers(markerOptionsList: ArrayList<MarkerOptions>) {
         if (isSmallMap) {
             if (markerOptionsList.isEmpty()) {
-                UiThreadHandler.post {
-                    smallSiteMarkerList?.forEach {
-                        it.destroy()
-                    }
-                    smallSiteMarkerList = null
-                }
+                clearSmallSites()
             } else {
                 UiThreadHandler.post {
                     smallSiteMarkerList = mAMap?.addMarkers(markerOptionsList, false)
@@ -2251,7 +2258,7 @@ class TravelRealityView @JvmOverloads constructor(
     }
 
     private fun realDrawSiteMarkers(options: ArrayList<MarkerOptions>) {
-        CallerLogger.d("$M_MAP$TAG", "realDrawSiteMarkers")
+        CallerLogger.d("$M_MAP$TAG", "realDrawSiteMarkers,optEmpty:${options.isEmpty()}")
         siteMarkerList.forEach {
             it.destroy()
         }