From 2a825b3649d0eeb2a9b9411bf00938a54158e950 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 30 Nov 2023 14:13:04 +0800 Subject: [PATCH] [6.2.0] fix the icon of small mapview --- .../core/function/smp/view/SmallMapView.kt | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt index 36de05b2ee..e102f53524 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt @@ -162,6 +162,8 @@ class SmallMapView @JvmOverloads constructor( ) } + private var iconRes = R.drawable.map_car_icon + private fun initAMapView() { mCameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel.toFloat()) mAMap = mAMapNaviView!!.map @@ -172,9 +174,9 @@ class SmallMapView @JvmOverloads constructor( // 关闭显示实时路况图层,aMap是地图控制器对象。 mAMap?.isTrafficEnabled = false // 设置 锚点 图标 - val iconRes = if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { + iconRes = if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) { R.drawable.map_bus_icon - } else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) { + } else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode) || AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) { R.drawable.map_m2_icon } else { R.drawable.map_car_icon @@ -261,20 +263,11 @@ class SmallMapView @JvmOverloads constructor( } mLocation = mogoLocation if (mCarMarker == null) { - mCarMarker = - if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { - mAMap?.addMarker( - MarkerOptions() - .icon(BitmapDescriptorFactory.fromResource(R.drawable.map_bus_icon)) - .anchor(0.5f, 0.5f) - ) - } else { - mAMap?.addMarker( - MarkerOptions() - .icon(BitmapDescriptorFactory.fromResource(R.drawable.map_car_icon)) - .anchor(0.5f, 0.5f) - ) - } + mCarMarker = mAMap?.addMarker( + MarkerOptions() + .icon(BitmapDescriptorFactory.fromResource(iconRes)) + .anchor(0.5f, 0.5f) + ) } if (mCarMarker == null) { return