From 21918ec8956bdd01cc12b49b74138a5d749d2aef Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 18 Jul 2024 14:46:23 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[fea]=20[=E5=B1=95=E7=A4=BA=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E4=BA=8B=E4=BB=B6]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wigets/map/overmapview/OverMapView.kt     | 36 ++++++++++---------
 .../passenger/ui/overmapview/OverMapView.kt   | 36 ++++++++++---------
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapView.kt
index 22c5d1bf5a..b5cc5f1afd 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapView.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapView.kt
@@ -32,21 +32,21 @@ class OverMapView @JvmOverloads constructor(
 
     private val listener = object : TravelRealityView.OnDrawListener{
         override fun onDraw(eventList: List<EventDrawBean>, isEvent: Boolean) {
-            if(isEvent){
-                eventDrawBeansTrue.clear()
-                eventDrawBeansTrue.addAll(eventList)
-            }else{
-                eventDrawBeansFalse.clear()
-                eventDrawBeansFalse.addAll(eventList)
-            }
-            iconListItemAdapter?.let {
-                it.setDataList(eventDrawBeansTrue+eventDrawBeansFalse)
-                if(it.itemCount==0){
-                    ovbv_bottom_icons_cl.visibility = GONE
-                }else{
-                    ovbv_bottom_icons_cl.visibility = VISIBLE
-                }
-            }
+//            if(isEvent){
+//                eventDrawBeansTrue.clear()
+//                eventDrawBeansTrue.addAll(eventList)
+//            }else{
+//                eventDrawBeansFalse.clear()
+//                eventDrawBeansFalse.addAll(eventList)
+//            }
+//            iconListItemAdapter?.let {
+//                it.setDataList(eventDrawBeansTrue+eventDrawBeansFalse)
+//                if(it.itemCount==0){
+//                    ovbv_bottom_icons_cl.visibility = GONE
+//                }else{
+//                    ovbv_bottom_icons_cl.visibility = VISIBLE
+//                }
+//            }
         }
 
     }
@@ -66,12 +66,14 @@ class OverMapView @JvmOverloads constructor(
         //ovbv_bottom_icons?.setHasFixedSize(true)
         iconListItemAdapter = IconListItemAdapter(
             context, mutableListOf(
-
+                EventDrawBean(R.drawable.mogo_quanxi_lukou, "全息路口"),
+                EventDrawBean(R.drawable.mogo_jingzhi_nor, "静止事件"),
+                EventDrawBean(R.drawable.mogo_shigong_image, "道路施工"),
+                EventDrawBean(R.drawable.mogo_shigu_nor, "交通事故")
             )
         )
 
         ovbv_bottom_icons?.adapter = iconListItemAdapter
-        ovbv_bottom_icons_cl.visibility = GONE
 
         travelRealityView.setOnDrawListener(listener)
 
diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/overmapview/OverMapView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/overmapview/OverMapView.kt
index b90617e245..0ed5aa9938 100644
--- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/overmapview/OverMapView.kt
+++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/overmapview/OverMapView.kt
@@ -33,21 +33,21 @@ class OverMapView @JvmOverloads constructor(
 
     private val listener = object :TravelRealityView.OnDrawListener{
         override fun onDraw(eventList: List<EventDrawBean>, isEvent: Boolean) {
-            if(isEvent){
-                eventDrawBeansTrue.clear()
-                eventDrawBeansTrue.addAll(eventList)
-            }else{
-                eventDrawBeansFalse.clear()
-                eventDrawBeansFalse.addAll(eventList)
-            }
-            iconListItemAdapter?.let {
-                it.setDataList(eventDrawBeansTrue+eventDrawBeansFalse)
-                if(it.itemCount==0){
-                    ovbv_bottom_icons.visibility = GONE
-                }else{
-                    ovbv_bottom_icons.visibility = VISIBLE
-                }
-            }
+//            if(isEvent){
+//                eventDrawBeansTrue.clear()
+//                eventDrawBeansTrue.addAll(eventList)
+//            }else{
+//                eventDrawBeansFalse.clear()
+//                eventDrawBeansFalse.addAll(eventList)
+//            }
+//            iconListItemAdapter?.let {
+//                it.setDataList(eventDrawBeansTrue+eventDrawBeansFalse)
+//                if(it.itemCount==0){
+//                    ovbv_bottom_icons.visibility = GONE
+//                }else{
+//                    ovbv_bottom_icons.visibility = VISIBLE
+//                }
+//            }
         }
 
     }
@@ -77,12 +77,14 @@ class OverMapView @JvmOverloads constructor(
         //ovbv_bottom_icons?.setHasFixedSize(true)
         iconListItemAdapter = IconListItemAdapter(
             context, mutableListOf(
-
+                EventDrawBean(R.drawable.mogo_quanxi_lukou, "全息路口"),
+                EventDrawBean(R.drawable.mogo_jingzhi_nor, "静止事件"),
+                EventDrawBean(R.drawable.mogo_shigong_image, "道路施工"),
+                EventDrawBean(R.drawable.mogo_shigu_nor, "交通事故")
             )
         )
 
         ovbv_bottom_icons?.adapter = iconListItemAdapter
-        ovbv_bottom_icons.visibility = GONE
 
         travelRealityView.setOnDrawListener(listener)