diff --git a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/BusPassengerProvider.kt b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/BusPassengerProvider.kt index e44553a75d..6ace107c8c 100644 --- a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/BusPassengerProvider.kt +++ b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/BusPassengerProvider.kt @@ -59,7 +59,7 @@ class BusPassengerProvider : CommonServiceImpl() { } else if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) { BusPStatusBarView(context) } else{ - StatusBarView(context) + BusPStatusBarView(context) } } return statusBarView!! diff --git a/OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_status_bar.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_status_bar.xml index 23bf8fc8d3..53ff040e93 100644 --- a/OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_status_bar.xml +++ b/OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_status_bar.xml @@ -26,6 +26,7 @@ android:layout_height="@dimen/dp_28" android:layout_gravity="center" android:layout_marginStart="@dimen/dp_40" + app:wifi_size="@dimen/dp_18" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@+id/status_bar_logo" app:layout_constraintTop_toTopOf="parent" /> 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 7de5eff93e..59d0507764 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -104,39 +104,29 @@ object ConfigStartUp { } private fun initOtherConfig(context: Context) { - if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { - HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche - } else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { - HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaoba - } else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) { - HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei - } if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)){ HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaoba } - if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ - HdMapBuildConfig.currentCarVrIconRes = R.raw.m1 - } 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)) { - if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) || - AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode) - || AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) || - AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) { - //是否显示 限速UI - HmiBuildConfig.isShowLimitingVelocityView = false - //白天模式 - FunctionBuildConfig.skinMode = 1 - } else if (AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)|| - AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { - //是否显示 限速UI - HmiBuildConfig.isShowLimitingVelocityView = false - //白天模式 - FunctionBuildConfig.skinMode = 1 - } + //是否显示 限速UI + HmiBuildConfig.isShowLimitingVelocityView = false + //白天模式 + FunctionBuildConfig.skinMode = 1 + } + if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { + } val mapParams = MapParams.init()