From c7d5498dfd7fa80a9553e8b714e8570edbd3d2d4 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 3 Dec 2024 16:08:08 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.0]=20[fea]=20[=E6=81=A2=E5=A4=8D=20?= =?UTF-8?q?=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6=E5=88=A0=E9=99=A4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/module/wigets/map/overmapview/OverMapView.kt | 8 ++++---- .../common/src/main/res/layout/common_overmap_view.xml | 1 - .../mogo/och/taxi/passenger/ui/overmapview/OverMapView.kt | 8 ++++---- OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml | 1 - 4 files changed, 8 insertions(+), 10 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 0818b9dfcf..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 @@ -66,10 +66,10 @@ 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, "交通事故") + EventDrawBean(R.drawable.mogo_quanxi_lukou, "全息路口"), + EventDrawBean(R.drawable.mogo_jingzhi_nor, "静止事件"), + EventDrawBean(R.drawable.mogo_shigong_image, "道路施工"), + EventDrawBean(R.drawable.mogo_shigu_nor, "交通事故") ) ) diff --git a/OCH/common/common/src/main/res/layout/common_overmap_view.xml b/OCH/common/common/src/main/res/layout/common_overmap_view.xml index 4118349741..e3eb9a9b50 100644 --- a/OCH/common/common/src/main/res/layout/common_overmap_view.xml +++ b/OCH/common/common/src/main/res/layout/common_overmap_view.xml @@ -29,7 +29,6 @@ android:id="@+id/ovbv_bottom_icons_cl" android:layout_width="match_parent" android:layout_height="@dimen/dp_150" - android:visibility="gone" android:background="@color/common_232A3F" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true"> 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 d414924cb5..d62a9c0e14 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 @@ -77,10 +77,10 @@ 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, "交通事故") + EventDrawBean(R.drawable.mogo_quanxi_lukou, "全息路口"), + EventDrawBean(R.drawable.mogo_jingzhi_nor, "静止事件"), + EventDrawBean(R.drawable.mogo_shigong_image, "道路施工"), + EventDrawBean(R.drawable.mogo_shigu_nor, "交通事故") ) ) diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml index c892bfadaf..96017b653f 100644 --- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml @@ -31,7 +31,6 @@ android:paddingEnd="@dimen/dp_60" android:paddingTop="@dimen/dp_4" android:paddingBottom="@dimen/dp_4" - android:visibility="gone" android:layout_width="@dimen/dp_690" android:layout_height="wrap_content" android:layout_alignParentBottom="true"