Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HdMapBuildConfig.kt

@@ -1,8 +1,6 @@
 package com.mogo.eagle.core.data.config
 
 import com.mogo.eagle.core.data.R
-import com.mogo.eagle.core.data.enums.Carmodel
-import kotlin.properties.Delegates
 
 /**
  * @author xiaoyuzhou
@@ -14,9 +12,9 @@ object HdMapBuildConfig {
      * 自车模型(默认是出租车)
      * 可以指定，R.raw.chuzuche，R.raw.xiaobache，R.raw.hongqi
      */
-    var currentCarVrIconRes by Delegates.observable(R.raw.hq_h9) { _, _, newValue ->
-        carModel = Carmodel.values().find { it.resId == newValue }
-    }
+    @Volatile
+    @JvmField
+    var currentCarVrIconRes = R.raw.hq_h9
 
     /**
      * 地图 DEFAULT 是否加载成功
@@ -26,12 +24,4 @@ object HdMapBuildConfig {
     @JvmField
     var isMapLoaded = false
 
-
-    /**
-     * 表示当前车机数据实体
-     */
-    @Volatile
-    @JvmField
-    var carModel: Carmodel? = null
-
 }

libraries/mogo-map/src/main/java/com/mogo/map/MogoAutoView.kt

@@ -30,8 +30,8 @@ class MoGoAutoView: MapAutoView {
     private class MarkerControllerWrapper(private val controller: IMarkerController): IMarkerController by controller {
 
         override fun addSelfCar(markerOptions: MarkerOptions): Marker? {
-            Logger.d(TAG, "addSelfCar-> ${HdMapBuildConfig.carModel}")
-            if (HdMapBuildConfig.carModel == T2) {
+            Logger.d(TAG, "addSelfCar-> ${HdMapBuildConfig.currentCarVrIconRes}")
+            if (HdMapBuildConfig.currentCarVrIconRes == T2.resId) {
                 markerOptions.scale = 1.05f
             }
             return controller.addSelfCar(markerOptions)