From 8d9a1a48b7bd219406397727a40d0bd57a16e5b6 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 20 Apr 2021 17:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E7=BA=BF=E7=BB=98=E5=88=B6?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E9=87=8D=E5=A4=8D,=E7=BB=98=E5=88=B6?=
 =?UTF-8?q?=E5=89=8D=E5=85=88=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/drawer/V2XWarnDataDrawer.java      | 10 +++++++
 .../main/res/layout/window_test_console.xml   | 30 +++++++++----------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
index 94a3af8e9e..cc46a2059b 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
@@ -1,6 +1,7 @@
 package com.mogo.module.common.drawer;
 
 import android.util.Log;
+import android.widget.LinearLayout;
 
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
@@ -21,6 +22,9 @@ import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.ViewUtils;
 import com.mogo.utils.logger.Logger;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_CLOUD_STOP_LINE_DATA;
 import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_CLOUD_WARN_DATA;
 
@@ -33,6 +37,7 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
     private static final String TAG = "V2XWarnDataDrawer";
     private static volatile V2XWarnDataDrawer sInstance;
     private boolean mChangeCarModeStatus;
+    private List<IMogoMarker> stopLineMarker = new ArrayList();
 
     private V2XWarnDataDrawer() {
         super();
@@ -164,6 +169,11 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
      * @param data
      */
     public void renderStopLineData(V2XWarningEntity data) {
+        if (stopLineMarker.size() > 0) {
+            for (int i = 0; i < stopLineMarker.size(); i++) {
+                stopLineMarker.get(i).remove();
+            }
+        }
         MarkerLocation location = new MarkerLocation();
         location.setLat(data.getLat());
         location.setLon(data.getLon());
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
index 519659e5b6..874e77dc9f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
@@ -237,6 +237,7 @@
                 android:textColor="#FFFFFF"
                 android:textSize="@dimen/dp_22"
                 android:textStyle="bold" />
+
             <Button
                 android:id="@+id/btnTriggerWarningEvent"
                 android:layout_width="wrap_content"
@@ -432,6 +433,20 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
+            <Button
+                android:id="@+id/btnAdasDataWarn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:layout_marginBottom="@dimen/dp_10"
+                android:background="#8BC34A"
+                android:padding="@dimen/dp_10"
+                android:text="车路云场景预警-右侧"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/dp_22"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
             <Button
                 android:id="@+id/btnTriggerPedestrianWarning"
                 android:layout_width="wrap_content"
@@ -473,21 +488,6 @@
                 android:textSize="@dimen/dp_22"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
-
-            <Button
-                android:id="@+id/btnAdasDataWarn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#8BC34A"
-                android:padding="@dimen/dp_10"
-                android:text="车路云场景预警-右侧"
-                android:textColor="#FFFFFF"
-                android:textSize="@dimen/dp_22"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
         </com.google.android.flexbox.FlexboxLayout>