From fd8fd17cdf9bb511ef9df4dff56c6afe60824b1b Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Sun, 20 Dec 2020 15:05:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E7=A0=94=E5=9C=B0=E5=9B=BE=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E6=A8=A1=E5=BC=8F,=E8=A7=A6=E5=8F=91=E9=81=93?=
 =?UTF-8?q?=E8=B7=AF=E4=BA=8B=E4=BB=B6=E6=89=93=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/manager/impl/MoGoV2XMarkerManager.java     | 10 ++++++++--
 .../src/main/res/layout/window_test_console.xml    | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
index e1156aeb49..b0c1ef448d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
@@ -9,12 +9,14 @@ import com.mogo.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
+import com.mogo.map.marker.IMogoMarkerIconViewCreator;
 import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.common.drawer.MarkerDrawer;
 import com.mogo.module.common.drawer.marker.IMarkerView;
 import com.mogo.module.common.drawer.marker.MapMarkerAdapter;
+import com.mogo.module.common.drawer.marker.MapMarkerView;
 import com.mogo.module.common.drawer.marker.RoadConditionInfoWindow3DAdapter;
 import com.mogo.module.common.entity.MarkerCardResult;
 import com.mogo.module.common.entity.MarkerExploreWay;
@@ -539,9 +541,10 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
                 MarkerShowEntity markerShowEntity = new MarkerShowEntity();
                 MarkerExploreWay markerExploreWay = roadEventEntity.getNoveltyInfo();
                 markerShowEntity.setBindObj(markerExploreWay);
+                markerShowEntity.setChecked(false);
+                markerShowEntity.setTextContent(markerExploreWay.getAddr());
                 markerShowEntity.setMarkerLocation(markerExploreWay.getLocation());
-                markerShowEntity.setMarkerType(markerExploreWay.getPoiType());
-                markerShowEntity.setTextContent(markerExploreWay.getPoiType());
+                markerShowEntity.setMarkerType(ServiceConst.CARD_TYPE_NOVELTY);
 
                 // 由于性能问题，D车机不使用事件扩散动画
                 if (!CarSeries.isF8xxSeries()) {
@@ -555,6 +558,9 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
                     mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions()));
                     mAlarmInfoMarker.showInfoWindow();
                 } else {
+                    IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(context, markerShowEntity, optionsRipple);
+                    Bitmap bitmap = ViewUtils.fromView(iMarkerView.getView());
+                    optionsRipple.icon(bitmap);
                     IMogoMarkerManager i = V2XServiceManager.getMarkerManager();
                     mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple);
                 }
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 d7f0e36309..2f384b8a3f 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
@@ -124,6 +124,20 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
+            <Button
+                android:id="@+id/test"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:layout_marginBottom="@dimen/dp_10"
+                android:background="#2651A6"
+                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/btnTriggerParkEvent"
                 android:layout_width="wrap_content"