From 4822fdb57a7f6eab2bb668cfa75066cf7ec509d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 10 Jan 2020 11:13:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmarker=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/view_map_marker.xml   | 43 +++++++++++--------
 .../main/res/layout/view_map_marker_info.xml  | 26 +++++------
 2 files changed, 38 insertions(+), 31 deletions(-)

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 06fe0259a4..78cc7c93b1 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
@@ -7,31 +7,46 @@
     android:orientation="vertical"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" >
 
+    <ImageView
+        android:id="@+id/ivCar"
+        android:layout_width="@dimen/dp_34"
+        android:layout_height="@dimen/dp_64"
+        android:rotation="270"
+        android:src="@drawable/icon_map_marker_car_blue"
+        android:translationY="-5dp"
+        app:layout_constraintEnd_toEndOf="@+id/ivBg"
+        app:layout_constraintStart_toStartOf="@+id/ivBg"
+        app:layout_constraintTop_toBottomOf="@+id/ivBg" />
+
     <ImageView
         android:id="@+id/ivBg"
-        android:layout_width="@dimen/dp_88"
-        android:layout_height="@dimen/dp_105"
+        android:layout_width="@dimen/dp_68"
+        android:layout_height="@dimen/dp_85"
         android:layout_gravity="center"
         android:src="@drawable/bg_map_marker_blue"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
+    <com.mogo.service.imageloader.MogoImageView
         android:id="@+id/ivIcon"
-        android:layout_width="@dimen/dp_76"
-        android:layout_height="@dimen/dp_76"
+        android:layout_width="@dimen/dp_56"
+        android:layout_height="@dimen/dp_56"
         android:layout_gravity="center"
         android:layout_marginTop="@dimen/dp_6"
-        android:src="@drawable/icon_default"
+        android:background="@drawable/icon_default"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="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_shape="circle" />
 
     <ImageView
         android:id="@+id/ivIconForeground"
-        android:layout_width="@dimen/dp_76"
-        android:layout_height="@dimen/dp_76"
+        android:layout_width="@dimen/dp_56"
+        android:layout_height="@dimen/dp_56"
         android:layout_gravity="center"
         android:layout_marginTop="@dimen/dp_6"
         android:src="@drawable/icon_map_marker_music_play"
@@ -39,14 +54,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
-    <ImageView
-        android:id="@+id/ivCar"
-        android:layout_width="@dimen/dp_34"
-        android:layout_height="@dimen/dp_64"
-        android:rotation="270"
-        android:src="@drawable/icon_map_marker_car_blue"
-        app:layout_constraintEnd_toEndOf="@+id/ivBg"
-        app:layout_constraintStart_toStartOf="@+id/ivBg"
-        app:layout_constraintTop_toBottomOf="@+id/ivBg" />
 </merge >
\ No newline at end of file
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 48b96abba9..388674c7e2 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
@@ -8,10 +8,21 @@
     android:orientation="horizontal"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" >
 
+    <ImageView
+        android:id="@+id/ivCar"
+        android:layout_width="@dimen/dp_34"
+        android:layout_height="@dimen/dp_64"
+        android:rotation="270"
+        android:src="@drawable/icon_map_marker_car_blue"
+        android:translationY="-5dp"
+        app:layout_constraintEnd_toEndOf="@+id/ivReverseTriangle"
+        app:layout_constraintStart_toStartOf="@+id/ivReverseTriangle"
+        app:layout_constraintTop_toBottomOf="@+id/ivReverseTriangle" />
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/llMarkerContent"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_94"
+        android:layout_height="@dimen/dp_74"
         android:background="@drawable/bg_map_marker_blue_info"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -19,8 +30,8 @@
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/ivUserHead"
-            android:layout_width="@dimen/dp_80"
-            android:layout_height="@dimen/dp_80"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_60"
             android:background="@drawable/icon_default"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -54,13 +65,4 @@
         app:layout_constraintStart_toStartOf="@+id/llMarkerContent"
         app:layout_constraintTop_toBottomOf="@+id/llMarkerContent" />
 
-    <ImageView
-        android:id="@+id/ivCar"
-        android:layout_width="@dimen/dp_34"
-        android:layout_height="@dimen/dp_64"
-        android:rotation="270"
-        android:src="@drawable/icon_map_marker_car_blue"
-        app:layout_constraintEnd_toEndOf="@+id/ivReverseTriangle"
-        app:layout_constraintStart_toStartOf="@+id/ivReverseTriangle"
-        app:layout_constraintTop_toBottomOf="@+id/ivReverseTriangle" />
 </merge >
\ No newline at end of file