From 5011874238e120359e1cea93b7ffae8a004b68fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 15 Jan 2020 11:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=9B=A0=E4=B8=BA=E6=95=B0=E6=8D=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=85=A8=E5=AF=BC=E8=87=B4=E7=9A=84Marker=E7=BB=98=E5=88=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/marker/MapMarkerBaseView.java       |  10 +++++++---
 .../module/service/marker/MapMarkerView.java    |   4 +---
 .../main/res/drawable-xhdpi/icon_default.png    | Bin 13510 -> 0 bytes
 .../src/main/res/layout/view_map_marker.xml     |   6 +++---
 .../main/res/layout/view_map_marker_info.xml    |   6 +++---
 5 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_default.png

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 d24606ab1d4539e00e62b678bbf28792fa9506ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13510
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
As{jB1

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" />
 
     <ImageView
diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
index 7a7c5017d4..9da9fd1c45 100644
--- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
+++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
@@ -33,9 +33,9 @@
             android:layout_height="@dimen/dp_60"
             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" />
 
         <ImageView