Merge remote-tracking branch 'origin/feature/feature_mogo_obu' into feature/feature_mogo_obu

modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt

@@ -173,34 +173,36 @@ object TrafficMarkerDrawer {
         val resId: Int = trafficData.type.traffic3DIconId
         val resIdVal = resId.toString() + ""
         val options = marker.mogoMarkerOptions
-        options.resName(mMarkerCachesResMd5Values[resIdVal])
-            .icon3DRes(resId)
+        if (options != null) {
+            options.resName(mMarkerCachesResMd5Values[resIdVal])
+                    .icon3DRes(resId)
 
-        if (trafficData.type != TrafficTypeEnum.TYPE_TRAFFIC_ID_SPECIAL_VEHICLE) {
-            // 修改颜色
-            when (trafficData.threatLevel) {
-                1 -> {
-                    mMarkersCaches[trafficData.uuid]?.setAnchorColor("#D8D8D8FF")
-                }
-                2 -> {
-                    mMarkersCaches[trafficData.uuid]?.setAnchorColor("#FFD53EFF")
-                }
-                3 -> {
-                    mMarkersCaches[trafficData.uuid]?.setAnchorColor("#FF3C45FF")
-                }
-                else -> {
-                    mMarkersCaches[trafficData.uuid]?.setAnchorColor("#D8D8D8FF")
+            if (trafficData.type != TrafficTypeEnum.TYPE_TRAFFIC_ID_SPECIAL_VEHICLE) {
+                // 修改颜色
+                when (trafficData.threatLevel) {
+                    1 -> {
+                        mMarkersCaches[trafficData.uuid]?.setAnchorColor("#D8D8D8FF")
+                    }
+                    2 -> {
+                        mMarkersCaches[trafficData.uuid]?.setAnchorColor("#FFD53EFF")
+                    }
+                    3 -> {
+                        mMarkersCaches[trafficData.uuid]?.setAnchorColor("#FF3C45FF")
+                    }
+                    else -> {
+                        mMarkersCaches[trafficData.uuid]?.setAnchorColor("#D8D8D8FF")
+                    }
                 }
             }
-        }
 
-        marker.addDynamicAnchorPosition(
-            MogoLatLng(
-                trafficData.lat,
-                trafficData.lon
-            ),
-            trafficData.heading.toFloat(),
-            stepTime
-        )
+            marker.addDynamicAnchorPosition(
+                    MogoLatLng(
+                            trafficData.lat,
+                            trafficData.lon
+                    ),
+                    trafficData.heading.toFloat(),
+                    stepTime
+            )
+        }
     }
 }