diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt index d1f32f7487..4943a79453 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt @@ -167,11 +167,11 @@ class LoginProvider : LoginService { } CallerEagleBaseFunctionCall4OchManager.setOchLoginNo(loginInfo.phone) - CallerEagleBaseFunctionCall4OchManager.setOchCarModel(Carmodel.getCarModelFromServerName(loginInfo.carModel)) + CallerEagleBaseFunctionCall4OchManager.setOchCarModel(Carmodel.getCarModelFromServerName(loginInfo.carModel,loginInfo.tenantId)) CallerEagleBaseFunctionCall4OchManager.setOchPlateNumber(loginInfo.plateNumber) CallerEagleBaseFunctionCall4OchManager.updateTenantId(loginInfo.tenantId) - val carModel = Carmodel.getCarModelFromServerName(LoginStatusManager.getLoginInfo()?.carModel) + val carModel = Carmodel.getCarModelFromServerName(LoginStatusManager.getLoginInfo()?.carModel,loginInfo.tenantId) if(this.carModel!=carModel){ this.carModel = carModel LoginStatusManager.invokeCarModelChange(this.carModel) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/LoadingMapStatusView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/LoadingMapStatusView.kt index 001302d2a8..a065605df8 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/LoadingMapStatusView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/LoadingMapStatusView.kt @@ -66,10 +66,12 @@ class LoadingMapStatusView @JvmOverloads constructor( // 设置地图样式 MogoMapListenerHandler.mogoMapListenerHandler.onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR) - val currentByteArray= SkinResources.getInstance().getRawResourceBytes(HdMapBuildConfig.currentCarVrIconRes) - CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(currentByteArray,true) +// val currentByteArray= SkinResources.getInstance().getRawResourceBytes(HdMapBuildConfig.currentCarVrIconRes) +// CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(currentByteArray,true) - OchChainLogManager.writeChainLog("模型加载","加载地图成功、并切换模型,${LoginStatusManager.getLoginInfo()}") +// OchChainLogManager.writeChainLog("模型加载","加载地图成功、并切换模型,${LoginStatusManager.getLoginInfo()}") + + CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(HdMapBuildConfig.currentCarVrIconRes) UiThreadHandler.postDelayed({ visibility = GONE },2_000,UiThreadHandler.MODE.QUEUE) } @@ -86,11 +88,17 @@ class LoadingMapStatusView @JvmOverloads constructor( Log.d(TAG,"onCarModelChange") OchChainLogManager.writeChainLog("模型加载","模型修改${currentStatus}") if(HdMapBuildConfig.isMapLoaded){ - var currentByteArray= SkinResources.getInstance().getRawResourceBytes(HdMapBuildConfig.currentCarVrIconRes) +// var currentByteArray= SkinResources.getInstance().getRawResourceBytes(HdMapBuildConfig.currentCarVrIconRes) +// if (currentStatus!=null) { +// currentByteArray= SkinResources.getInstance().getRawResourceBytes(currentStatus.rawValue) +// } +// CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(currentByteArray,true) + + var currentByteArray= HdMapBuildConfig.currentCarVrIconRes if (currentStatus!=null) { - currentByteArray= SkinResources.getInstance().getRawResourceBytes(currentStatus.rawValue) + currentByteArray= currentStatus.rawValue } - CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(currentByteArray,true) + CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(currentByteArray) }else{ HdMapBuildConfig.currentCarVrIconRes = currentStatus?.rawValue?:Carmodel.B1.rawValue } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/Carmodel.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/Carmodel.kt index 73f59ab0f0..52388576c7 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/Carmodel.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/Carmodel.kt @@ -7,12 +7,14 @@ enum class Carmodel(val serverName:String,@RawRes val rawValue: Int, val resId: T1("E70", R.raw.chuzuche, R.drawable.icon_car_t1), T2("H9", R.raw.hq_h9, R.drawable.icon_car_t2), B1("B1", R.raw.xiaoba, R.drawable.icon_car_b1), - B2("B2", R.raw.m2, R.drawable.icon_car_b2), + CommonB2("B2", R.raw.m2, R.drawable.icon_car_b2), + DeQingB2("B2", R.raw.deqing_m2, R.drawable.icon_car_b2), + YiXinB2("B2", R.raw.yixin_m2, R.drawable.icon_car_b2), M1("M1", R.raw.m1, R.drawable.icon_car_m1), C1("C1", R.raw.huanwei, R.drawable.icon_car_c1),; companion object{ - fun getCarModelFromServerName(serverName:String?): Carmodel { + fun getCarModelFromServerName(serverName:String?,tenantId:Long): Carmodel { return when (serverName) { "E70" -> { T1 @@ -29,11 +31,20 @@ enum class Carmodel(val serverName:String,@RawRes val rawValue: Int, val resId: "NJL6450ICEV" -> { B1 } - "B2" -> { - B2 - } - "M2" -> { - B2 + "B2","M2" -> { + when (tenantId) { + 344633089273626654,337596266395467809 -> { + //德清 + DeQingB2 + } + 346499501671841863,337197925358633123 -> { + //易鑫 + YiXinB2 + } + else -> { + CommonB2 + } + } } "M1" -> { M1 diff --git a/core/mogo-core-res/src/main/res/raw/deqing_m2.nt3d b/core/mogo-core-res/src/main/res/raw/deqing_m2.nt3d new file mode 100644 index 0000000000..658d2660b6 Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/deqing_m2.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/yixin_m2.nt3d b/core/mogo-core-res/src/main/res/raw/yixin_m2.nt3d new file mode 100644 index 0000000000..658d2660b6 Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/yixin_m2.nt3d differ