From aecd524aca6a5f28a73849e7f6adc96dcddf72df Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Mon, 22 Jul 2024 12:09:10 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0][Fix]=E8=A7=A3=E5=86=B3=E6=9C=AA?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E4=B8=8A=E4=B8=80=E5=8D=95=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/travelreality/TravelRealityModel.kt   |  2 ++
 .../eagle/core/function/view/TravelRealityView.kt  | 14 +++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/travelreality/TravelRealityModel.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/travelreality/TravelRealityModel.kt
index 812bcafdff..355e4e7352 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/travelreality/TravelRealityModel.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/travelreality/TravelRealityModel.kt
@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.business.travelreality
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
+import android.util.Log
 import com.amap.api.maps.model.LatLng
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners
@@ -63,6 +64,7 @@ class TravelRealityModel private constructor() {
                 apiResponseCall{
                     val time = System.currentTimeMillis().toString()
                     val md5String = "${ROAD_EVENT_TRAJECTORY.uppercase(Locale.getDefault())}$time"
+                    Log.d("TravelRealityModel", "查询道路事件轨迹点个数为:${reqData.points.size}")
                     getNetWorkApi(HostConst.getNDEHost()).getEventsWithTrajRequest(Md5Util.getMD5Result(md5String), time, reqData)
                 }
             }
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 e6c6887e98..5db0216cf8 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
@@ -481,6 +481,8 @@ class TravelRealityView @JvmOverloads constructor(
             listener?.onDraw(emptyList(), true)
             // 事件不足3个则用路口设备补齐
             completeQuantity()
+            // 绘制道路事件
+            drawMarkers(DRAW_ROAD_EVENT, ArrayList<MarkerOptions>())
         } else {
             val eventDrawMap = HashMap<String, EventDrawBean>()
             val eventOptionsList = ArrayList<MarkerOptions>()
@@ -1298,11 +1300,13 @@ class TravelRealityView @JvmOverloads constructor(
             it.destroy()
         }
         eventMarkerList.clear()
-        mAMap?.let {
-            eventMarkerList.addAll(it.addMarkers(eventOptionList, false))
-        }
-        eventMarkerList.forEach {
-            it.isClickable = false
+        if (eventOptionList.isNotEmpty()) {
+            mAMap?.let {
+                eventMarkerList.addAll(it.addMarkers(eventOptionList, false))
+            }
+            eventMarkerList.forEach {
+                it.isClickable = false
+            }
         }
         Log.d(TAG, "计算到绘制事件耗时为:${System.currentTimeMillis() - testTime}")
     }