From 72c896b97e913c62108b1e5cafa3031583dd9fd2 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 6 Jun 2023 18:42:47 +0800 Subject: [PATCH] =?UTF-8?q?[3.2.0]fix=E5=B0=8F=E5=B7=B4=E8=BD=A6=E8=BD=AC?= =?UTF-8?q?=E5=90=91=E7=81=AF=E4=B8=8D=E6=98=BE=E7=A4=BABug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/launcher/startup/ConfigStartUp.kt | 4 ++-- .../binding/BindingCarNetWorkManager.kt | 12 ++++++------ .../function/hmi/ui/setting/DebugSettingView.kt | 6 +----- .../main/res/raw/{xiaobache.nt3d => xiaoba.nt3d} | Bin 4 files changed, 9 insertions(+), 13 deletions(-) rename core/mogo-core-res/src/main/res/raw/{xiaobache.nt3d => xiaoba.nt3d} (100%) 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 5959d41875..5ccbec8187 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -95,12 +95,12 @@ object ConfigStartUp { if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche } else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { - HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache + HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaoba } else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) { HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei } if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)){ - HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache + HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaoba } if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ HdMapBuildConfig.currentCarVrIconRes = R.raw.m1 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt index af836ff881..205aa21dcf 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt @@ -164,12 +164,12 @@ class BindingCarNetWorkManager private constructor() { HdMapBuildConfig.currentCarVrIconRes = R.raw.hq_h9 } "3" -> { //金旅 - CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache) - HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache + CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaoba) + HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaoba } "4" -> { //开沃 - CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache) - HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache + CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaoba) + HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaoba } "5" -> { //福田 CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.huanwei) @@ -181,8 +181,8 @@ class BindingCarNetWorkManager private constructor() { private fun getDefaultId(): String { return when (HdMapBuildConfig.currentCarVrIconRes) { R.raw.chuzuche -> "1" - R.raw.xiaobache -> "3" - R.raw.xiaobache -> "4" + R.raw.xiaoba -> "3" + R.raw.xiaoba -> "4" R.raw.huanwei -> "5" else -> "1" } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 6bf2920d26..962bbe9474 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -10,7 +10,6 @@ import android.os.Build import android.os.Process import android.text.Html import android.util.AttributeSet -import android.util.Log import android.view.LayoutInflater import android.view.View import androidx.annotation.RequiresApi @@ -65,12 +64,9 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.logcatch.ILogViewListener import com.mogo.eagle.core.function.hmi.ui.logcatch.LogInfoView -import com.mogo.eagle.core.function.hmi.ui.map.OfflineMapDialog import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView -import com.mogo.eagle.core.function.hmi.ui.widget.SystemVersionView import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -613,7 +609,7 @@ internal class DebugSettingView @JvmOverloads constructor( CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche) } else { // 替换为小巴车图标 - CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache) + CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaoba) } } diff --git a/core/mogo-core-res/src/main/res/raw/xiaobache.nt3d b/core/mogo-core-res/src/main/res/raw/xiaoba.nt3d similarity index 100% rename from core/mogo-core-res/src/main/res/raw/xiaobache.nt3d rename to core/mogo-core-res/src/main/res/raw/xiaoba.nt3d