From e56d78f794189a3ea7436e87c2ee32f86a7f9742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 15 Jan 2020 11:25:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-xhdpi/icon_default_user_head.png | Bin 0 -> 8569 bytes .../module/service/MarkerServiceHandler.java | 2 +- .../module/service/marker/MapMarkerBaseView.java | 2 +- .../src/main/res/layout/view_map_marker.xml | 6 +++--- .../src/main/res/layout/view_map_marker_info.xml | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_default_user_head.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_default_user_head.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_default_user_head.png new file mode 100644 index 0000000000000000000000000000000000000000..d5df99fa78a965e590311bc352567c4f5d3e6ced GIT binary patch literal 8569 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index 3289042e0e..77df271b52 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -299,7 +299,7 @@ public class MarkerServiceHandler { } } -// getMapUIController().changeZoom(12); + getMapUIController().changeZoom(8); } /** 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 c994b045aa..44a2edbc7b 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 @@ -80,7 +80,7 @@ public abstract class MapMarkerBaseView extends ConstraintLayout { } }); } else { - ivUserHead.setBackgroundResource(R.drawable.default_image); + ivUserHead.setBackgroundResource(R.drawable.icon_default_user_head); } } 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 1b69bcecef..d883a5d2af 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/default_image" - app:miv_overlayImageId="@drawable/default_image" - app:miv_placeHolder="@drawable/default_image" + app:miv_failureHolder="@drawable/icon_default_user_head" + app:miv_overlayImageId="@drawable/icon_default_user_head" + app:miv_placeHolder="@drawable/icon_default_user_head" app:miv_shape="circle" />