diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java index c27e42f6ca..c994b045aa 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java @@ -11,6 +11,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.service.MarkerServiceHandler; +import com.mogo.module.service.R; import com.mogo.service.imageloader.IMogoImageLoaderListener; import com.mogo.service.imageloader.MogoImageView; import com.mogo.utils.WindowUtils; @@ -55,6 +56,7 @@ public abstract class MapMarkerBaseView extends ConstraintLayout { public abstract void updateView(MarkerShowEntity markerShowEntity); protected void loadImageWithMarker(MarkerShowEntity markerShowEntity) { + if (!TextUtils.isEmpty(markerShowEntity.getIconUrl())) { MarkerServiceHandler .getImageloader() @@ -69,15 +71,17 @@ public abstract class MapMarkerBaseView extends ConstraintLayout { @Override public void onCompleted(Bitmap bitmap) { - // 刷新图标 - Logger.d(TAG, "loaded."); + Logger.d(TAG, "loadImageWithMarker loaded."); } @Override public void onFailure(Exception e) { - + Logger.e(TAG, "loadImageWithMarker onFailure."); } }); + } else { + ivUserHead.setBackgroundResource(R.drawable.default_image); } + } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java index 7030794fac..a800faabe7 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java @@ -44,8 +44,6 @@ public class MapMarkerView extends MapMarkerBaseView { } protected void initView(Context context) { - setBackground(null); - LayoutInflater.from(context).inflate(R.layout.view_map_marker, this); ivUserHead = findViewById(R.id.ivUserHead); ivIcon = findViewById(R.id.ivIcon); @@ -77,7 +75,7 @@ public class MapMarkerView extends MapMarkerBaseView { ivUserHead.setVisibility(View.INVISIBLE); ivIcon.setVisibility(View.VISIBLE); - ivUserHead.setImageResource(R.drawable.icon_map_marker_road_block_up); + ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up); ivBg.setImageResource(R.drawable.bg_map_marker_blue); ivCar.setImageResource(R.drawable.icon_map_marker_location_blue); break; diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_default.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_default.png deleted file mode 100644 index d24606ab1d..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_default.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml index a8c58a240d..1b69bcecef 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml @@ -36,9 +36,9 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:miv_failureHolder="@drawable/icon_default" - app:miv_overlayImageId="@drawable/icon_default" - app:miv_placeHolder="@drawable/icon_default" + app:miv_failureHolder="@drawable/default_image" + app:miv_overlayImageId="@drawable/default_image" + app:miv_placeHolder="@drawable/default_image" app:miv_shape="circle" />