[6.2.4] fix bug of sound play helper , devices extends lenovo , npl of map init

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt

@@ -119,6 +119,11 @@ class AiRoadMarker {
                         countDown.incrementAndGet()
                         realMark(marker, wrapper, l1, l2, location.heading)
                     })
+            }else{
+                wrapper.onRemoved = { id ->
+                    aiMakers.remove(id)
+                }
+                MarkerRemoveManager.addMarker(wrapper)
             }
         }
     }

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.kt

@@ -22,7 +22,7 @@ import com.mogo.map.location.IMogoGDLocationClient
 class MogoMapService : IMogoMapService {
 
     override fun getMapUIController(mapTag:String): IMogoMapUIController? {
-        return mapInstance.getMogoMap().uiController
+        return mapInstance.getMogoMap()?.uiController
     }
 
     override fun getOverlayManager(): IMoGoOverlayManager {

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java

@@ -313,7 +313,7 @@ public final class DeviceUtils {
     }
 
     public static Boolean isLenovoModel(){
-        return getModel().contains("Lenovo");
+        return getModel().contains("Lenovo") || getBrand().contains("Lenovo");
     }
 
     public static Boolean isEB5Model(){
@@ -336,6 +336,16 @@ public final class DeviceUtils {
         return model;
     }
 
+    public static String getBrand() {
+        String brand = Build.BRAND;
+        if (brand != null) {
+            brand = brand.trim().replaceAll("\\s*", "");
+        } else {
+            brand = "";
+        }
+        return brand;
+    }
+
     /**
      * Return an ordered list of ABIs supported by this device. The most preferred ABI is the first
      * element in the list.