Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

# Conflicts:
#	OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/LoadingMapStatusView.kt
This commit is contained in:
yangyakun
2024-10-30 10:26:05 +08:00

View File

@@ -86,11 +86,11 @@ class LoadingMapStatusView @JvmOverloads constructor(
if(HdMapBuildConfig.isMapLoaded){
var currentByteArray= SkinResources.getInstance().getRawResourceBytes(HdMapBuildConfig.currentCarVrIconRes)
if (currentStatus!=null) {
currentByteArray= SkinResources.getInstance().getRawResourceBytes(currentStatus.resId)
currentByteArray= SkinResources.getInstance().getRawResourceBytes(currentStatus.rawValue)
}
CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(currentByteArray,true)
}else{
HdMapBuildConfig.currentCarVrIconRes = currentStatus?.resId?:Carmodel.B1.resId
HdMapBuildConfig.currentCarVrIconRes = currentStatus?.rawValue?:Carmodel.B1.rawValue
}
}