From 8b5e57bcf706b78993f4ab4576bcb9cadaa01dbb Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Sat, 14 Sep 2024 17:15:55 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[=E9=80=9A=E8=BF=87=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E8=AE=BE=E7=BD=AE=E8=BD=A6=E5=9E=8B]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/module/wigets/CommonLoadingView.kt | 28 +++++++++++++++++++
 .../mogo/launcher/startup/ConfigStartUp.kt    | 15 ----------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonLoadingView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonLoadingView.kt
index 7d762fad85..ce74bff7f9 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonLoadingView.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonLoadingView.kt
@@ -15,6 +15,7 @@ import com.mogo.map.listener.IMogoMapListener
 import com.mogo.map.listener.MogoMapListenerHandler
 import com.mogo.map.uicontroller.EnumMapUI
 import com.mogo.och.common.module.R
+import com.mogo.och.common.module.biz.login.LoginStatusManager
 import kotlinx.android.synthetic.main.common_loading_map.view.aciv_loading_map
 
 class CommonLoadingView @JvmOverloads constructor(
@@ -56,6 +57,33 @@ class CommonLoadingView @JvmOverloads constructor(
         HdMapBuildConfig.isMapLoaded = true
         // 设置地图样式
         MogoMapListenerHandler.mogoMapListenerHandler.onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR)
+        when (LoginStatusManager.getLoginInfo()?.carModel) {
+            "E70" -> {
+                HdMapBuildConfig.currentCarVrIconRes = com.mogo.eagle.core.data.R.raw.chuzuche
+            }
+            "H9" -> {
+                HdMapBuildConfig.currentCarVrIconRes = com.mogo.eagle.core.data.R.raw.hq_h9
+            }
+            "B1" -> {
+                HdMapBuildConfig.currentCarVrIconRes = com.mogo.eagle.core.data.R.raw.xiaoba
+            }
+            "B2" -> {
+                HdMapBuildConfig.currentCarVrIconRes = com.mogo.eagle.core.data.R.raw.m2
+            }
+            "M1" -> {
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.m1
+            }
+            "金旅牌XML6606JEVY0"-> {
+                HdMapBuildConfig.currentCarVrIconRes = com.mogo.eagle.core.data.R.raw.xiaoba
+            }
+            "NJL6450ICEV"-> {
+                HdMapBuildConfig.currentCarVrIconRes = com.mogo.eagle.core.data.R.raw.xiaoba
+            }
+            "BJ5122TXSEV-H1"-> {
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei
+            }
+            else -> {}
+        }
         CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(HdMapBuildConfig.currentCarVrIconRes)
         UiThreadHandler.postDelayed({ visibility = GONE },2_000,UiThreadHandler.MODE.QUEUE)
     }
diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
index 4565479a84..a7cf796c2c 100644
--- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
@@ -104,21 +104,6 @@ object ConfigStartUp {
     }
 
     private fun initOtherConfig(context: Context) {
-        if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)){
-            HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaoba
-        }
-        if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
-            HdMapBuildConfig.currentCarVrIconRes = R.raw.m2
-        }
-        if (AppIdentityModeUtils.isC1(FunctionBuildConfig.appIdentityMode)){
-            HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei
-        }
-        if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){
-            HdMapBuildConfig.currentCarVrIconRes = R.raw.m1
-        }
-        if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)){
-            HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche
-        }
         if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
             //是否显示 限速UI
             HmiBuildConfig.isShowLimitingVelocityView = false