From aaa10c39af333d91beb12e858f495b06cb8d3fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 13 Feb 2020 16:46:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG=20=E8=A7=A3=E5=86=B3UI?=
 =?UTF-8?q?=E8=B5=B0=E6=9F=A5=E6=8F=90=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/marker/MapMarkerBaseView.java     |  3 +-
 .../bg_shape_reverse_triangle_blue.xml        |  2 +
 .../main/res/drawable/ic_reverse_triangle.xml |  9 ++
 .../src/main/res/layout/view_map_marker.xml   | 88 ++++++++++---------
 .../main/res/layout/view_map_marker_info.xml  | 57 ++++++------
 5 files changed, 93 insertions(+), 66 deletions(-)
 create mode 100644 modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml

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 d0d225b4fb..aaa63c8edb 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
@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
@@ -25,7 +26,7 @@ import com.mogo.utils.logger.Logger;
  * desc   : 地图上抽离的Marker的共性
  * version: 1.0
  */
-public abstract class MapMarkerBaseView extends ConstraintLayout {
+public abstract class MapMarkerBaseView extends LinearLayout {
     private String TAG = "MapMarkerBaseView";
 
     protected Context mContext;
diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml
index b752a1633a..ae2ee542cc 100644
--- a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml
+++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml
@@ -8,6 +8,8 @@
             android:pivotY="15%"
             android:toDegrees="45" >
             <shape android:shape="rectangle" >
+                <size android:width="@dimen/dp_20"
+                    android:height="@dimen/dp_20"/>
                 <solid android:color="#256BFF" />
             </shape >
         </rotate >
diff --git a/modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml b/modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml
new file mode 100644
index 0000000000..bdb5fb7337
--- /dev/null
+++ b/modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="20dp"
+    android:viewportWidth="400"
+    android:viewportHeight="200" >
+    <path
+        android:fillColor="#256BFF"
+        android:pathData="M200.162432,198.826894l-200.162432,-198.826894l400.325329,0l-200.162897,198.826894z" />
+</vector >
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 cc0f489a99..52a06b7549 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
@@ -1,12 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:gravity="center"
     android:orientation="vertical"
+    android:paddingStart="@dimen/dp_5"
+    android:paddingEnd="@dimen/dp_5"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" >
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" >
+
+        <ImageView
+            android:id="@+id/ivBg"
+            android:layout_width="@dimen/dp_88"
+            android:layout_height="@dimen/dp_105"
+            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" />
+
+        <com.mogo.service.imageloader.MogoImageView
+            android:id="@+id/ivUserHead"
+            android:layout_width="@dimen/dp_76"
+            android:layout_height="@dimen/dp_76"
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/dp_6"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            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" />
+
+        <ImageView
+            android:id="@+id/ivIcon"
+            android:layout_width="@dimen/dp_76"
+            android:layout_height="@dimen/dp_76"
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/dp_6"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/icon_map_marker_road_block_up"
+            tools:visibility="visible" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout >
+
     <ImageView
         android:id="@+id/ivCar"
         android:layout_width="@dimen/dp_34"
@@ -15,42 +61,4 @@
         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_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" />
-
-    <com.mogo.service.imageloader.MogoImageView
-        android:id="@+id/ivUserHead"
-        android:layout_width="@dimen/dp_56"
-        android:layout_height="@dimen/dp_56"
-        android:layout_gravity="center"
-        android:layout_marginTop="@dimen/dp_6"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        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" />
-
-    <ImageView
-        android:id="@+id/ivIcon"
-        android:layout_width="@dimen/dp_45"
-        android:layout_height="@dimen/dp_45"
-        android:layout_gravity="center"
-        android:layout_marginTop="@dimen/dp_14"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/icon_map_marker_road_block_up"
-        tools:visibility="visible" />
-
-</merge >
\ No newline at end of file
+</LinearLayout >
\ 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 ae9abe9dfe..7aa4fa03d4 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
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:paddingStart="@dimen/dp_5"
+    android:paddingEnd="@dimen/dp_5"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" >
 
-    <ImageView
-        android:id="@+id/ivCar"
-        android:layout_width="@dimen/dp_34"
-        android:layout_height="@dimen/dp_64"
-        android:src="@drawable/icon_map_marker_car_gray"
-        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/clMarkerContent"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_74"
+        android:layout_height="@dimen/dp_90"
         android:background="@drawable/bg_map_marker_blue_info"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -28,8 +21,9 @@
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/ivUserHead"
-            android:layout_width="@dimen/dp_60"
-            android:layout_height="@dimen/dp_60"
+            android:layout_width="@dimen/dp_76"
+            android:layout_height="@dimen/dp_76"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:miv_failureHolder="@drawable/icon_default_user_head"
@@ -39,10 +33,9 @@
 
         <ImageView
             android:id="@+id/ivIcon"
-            android:layout_width="@dimen/dp_45"
-            android:layout_height="@dimen/dp_45"
+            android:layout_width="@dimen/dp_76"
+            android:layout_height="@dimen/dp_76"
             android:layout_gravity="center"
-            android:layout_marginLeft="@dimen/dp_14"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -67,14 +60,28 @@
             tools:text="诗一样的女子" />
     </androidx.constraintlayout.widget.ConstraintLayout >
 
-    <ImageView
-        android:id="@+id/ivReverseTriangle"
-        android:layout_width="10dp"
-        android:layout_height="10dp"
-        android:src="@drawable/bg_shape_reverse_triangle_blue"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="-10dp"
+        android:gravity="center"
+        android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="@+id/clMarkerContent"
         app:layout_constraintStart_toStartOf="@+id/clMarkerContent"
-        app:layout_constraintTop_toBottomOf="@+id/clMarkerContent" />
+        app:layout_constraintTop_toBottomOf="@+id/clMarkerContent" >
 
+        <ImageView
+            android:id="@+id/ivReverseTriangle"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:src="@drawable/bg_shape_reverse_triangle_blue" />
 
-</merge >
\ No newline at end of file
+        <ImageView
+            android:id="@+id/ivCar"
+            android:layout_width="@dimen/dp_34"
+            android:layout_height="@dimen/dp_64"
+            android:src="@drawable/icon_map_marker_car_gray"
+            android:translationY="-10dp" />
+    </LinearLayout >
+
+</LinearLayout >
\ No newline at end of file