From 3d3fa02cde2d7be2f3d177b3c4aaa4a705982ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 13 Sep 2021 11:34:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=81=B6=E7=8E=B0=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=8E=E8=BD=A6=E5=9B=BE=E6=A0=87=E4=B8=8D=E5=9C=A8=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E4=B8=8A=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/drawer/TrafficMarkerDrawer.kt      | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt
index b1d72a84cb..a6fc6fd193 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt
@@ -145,8 +145,8 @@ object TrafficMarkerDrawer {
      */
     private fun drawObuRecognizedDataMarker(trafficData: TrafficData) {
         Logger.d(
-            "MogoObu",
-            "drawObuRecognizedDataMarker trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel
+            TAG,
+            "trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel
         )
         if (trafficData.type != null) {
             val resId: Int = trafficData.type.traffic3DIconId
@@ -206,7 +206,10 @@ object TrafficMarkerDrawer {
         marker: IMogoMarker,
         trafficData: TrafficData
     ) {
-        Logger.d("MogoObu", "changeDynamicMarker trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel)
+        Logger.d(
+            TAG,
+            "trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel
+        )
         if (trafficData.type != TrafficTypeEnum.TYPE_TRAFFIC_ID_SPECIAL_VEHICLE) {
             // 修改颜色
             when (trafficData.threatLevel) {
@@ -225,13 +228,21 @@ object TrafficMarkerDrawer {
             }
         }
 
-        marker.addDynamicAnchorPosition(
-            MogoLatLng(
-                trafficData.lat,
-                trafficData.lon
-            ),
-            trafficData.heading.toFloat(),
-            stepTime
-        )
+        try {
+            marker.addDynamicAnchorPosition(
+                MogoLatLng(
+                    trafficData.lat,
+                    trafficData.lon
+                ),
+                trafficData.heading.toFloat(),
+                stepTime
+            )
+        } catch (e: NullPointerException) {
+            try {
+                drawObuRecognizedDataMarker(trafficData)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
     }
 }
\ No newline at end of file