yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.7.2]

Browse Source 
[fea]
[3d 模型变化]
This commit is contained in:
yangyakun
2024-11-01 17:42:24 +08:00
parent 6551e8fd93
commit a8329efb83
5 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt
View File

@@ -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)

20
OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/LoadingMapStatusView.kt
View File

@@ -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
}