From 14dd2cc5687afcad1d6497f9761b6c88f059849c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 13 Jan 2020 14:33:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E6=97=A0=E6=B3=95=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E7=9A=84Marker=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/service/MarkerServiceHandler.java    |  1 +
 .../drawable/bg_map_marker_dark_blue_info.xml   | 15 +++++++++++++++
 .../drawable/bg_shape_reverse_orange_green.xml  | 17 +++++++++++++++++
 .../bg_shape_reverse_triangle_dark_blue.xml     | 15 +++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_blue_info.xml
 create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_orange_green.xml
 create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_blue.xml

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 8f028d3bd1..d992f31ca6 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
@@ -157,6 +157,7 @@ public class MarkerServiceHandler {
      * 绘制Marker
      */
     public static void drawMapMarker(MarkerResponse response) {
+        lastMarker = null;
         getMarkerManager().removeMarkers();
 
         // 解析不同的Marker类型，然后对应的进行绘制
diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_blue_info.xml b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_blue_info.xml
new file mode 100644
index 0000000000..8b02f55024
--- /dev/null
+++ b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_blue_info.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <gradient
+        android:angle="270"
+        android:endColor="#3834FF"
+        android:startColor="#5985FF" />
+    <corners android:radius="360dp" />
+
+    <padding
+        android:bottom="@dimen/dp_6"
+        android:left="@dimen/dp_6"
+        android:right="@dimen/dp_40"
+        android:top="@dimen/dp_6" />
+
+</shape >
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_orange_green.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_orange_green.xml
new file mode 100644
index 0000000000..0755b4631d
--- /dev/null
+++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_orange_green.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/shape_id" >
+        <!-- 倒三角 -->
+        <rotate
+            android:fromDegrees="45"
+            android:pivotX="135%"
+            android:pivotY="15%"
+            android:toDegrees="45" >
+            <shape android:shape="rectangle" >
+                <solid android:color="#FB801E" />
+            </shape >
+        </rotate >
+    </item >
+
+
+</layer-list >
diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_blue.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_blue.xml
new file mode 100644
index 0000000000..6f7c6801d3
--- /dev/null
+++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_blue.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/shape_id" >
+        <!-- 倒三角 -->
+        <rotate
+            android:fromDegrees="45"
+            android:pivotX="135%"
+            android:pivotY="15%"
+            android:toDegrees="45" >
+            <shape android:shape="rectangle" >
+                <solid android:color="#3834FF" />
+            </shape >
+        </rotate >
+    </item >
+</layer-list >