From e56634fdf94b3088057bc0f87cc8f7ecacfd3ec5 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 10 Jul 2024 19:17:01 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0]=20refactor:=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E4=BA=8B=E4=BB=B6=E5=BC=B9=E6=A1=86=20UI=20?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/taxi_p_base_fragment.xml | 2 +- .../src/main/res/layout/taxt_u_p_base_fragment.xml | 2 +- .../function/hmi/ui/v2n/RoadV2NEventWindowView.kt | 13 +++++++------ .../drawable/bg_v2n_event_live_play_passenger.xml | 2 +- .../res/layout/hmi_view_road_v2n_event_window.xml | 8 ++++---- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml index 10afe272bc..32033a41e1 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -237,7 +237,7 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/dp_15" + android:layout_marginBottom="-80dp" app:layout_constraintBottom_toTopOf="@+id/aciv_xiaozhi_normal" app:layout_constraintRight_toRightOf="parent" android:visibility="gone"/> diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml index feceaa8276..fef4efacbb 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml @@ -231,7 +231,7 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/dp_15" + android:layout_marginBottom="-80dp" app:layout_constraintBottom_toTopOf="@+id/aciv_xiaozhi_normal" app:layout_constraintRight_toRightOf="parent" android:visibility="gone"/> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt index 5c87856b10..7c62335a9a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt @@ -101,7 +101,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor( containerIconHintLayoutParams.width = LayoutParams.MATCH_PARENT containerIconHintLayoutParams.height = LayoutParams.WRAP_CONTENT containerIconHintLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 50f), + AutoSizeUtils.dp2px(context, 50f - 17f), //乘客屏icon ivV2XImage带了白边 AutoSizeUtils.dp2px(context, 40f), AutoSizeUtils.dp2px(context, 50f), 0 @@ -109,14 +109,14 @@ class RoadV2NEventWindowView @JvmOverloads constructor( containerIconHint.layoutParams = containerIconHintLayoutParams val ivV2XImageLayoutParams = ivV2XImage.layoutParams as RelativeLayout.LayoutParams - ivV2XImageLayoutParams.width = AutoSizeUtils.dp2px(context, 69f + 20f) - ivV2XImageLayoutParams.height = AutoSizeUtils.dp2px(context, 69f + 20f) + ivV2XImageLayoutParams.width = AutoSizeUtils.dp2px(context, 69f + 34f) //乘客屏icon ivV2XImage带了白边 + ivV2XImageLayoutParams.height = AutoSizeUtils.dp2px(context, 69f + 34f) //乘客屏icon ivV2XImage带了白边 ivV2XImage.layoutParams = ivV2XImageLayoutParams val tvV2XHintContentLayoutParams = tvV2XHintContent.layoutParams as RelativeLayout.LayoutParams tvV2XHintContentLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 30f), 0, + AutoSizeUtils.dp2px(context, 30f - 17f), 0,//乘客屏icon ivV2XImage带了白边 AutoSizeUtils.dp2px(context, 15f), 0 ) tvV2XHintContent.layoutParams = tvV2XHintContentLayoutParams @@ -128,13 +128,13 @@ class RoadV2NEventWindowView @JvmOverloads constructor( containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 298f) containerImageAndLiveVideoLayoutParams.setMargins( AutoSizeUtils.dp2px(context, 51f), - AutoSizeUtils.dp2px(context, 30f), + AutoSizeUtils.dp2px(context, 0f), //乘客屏icon ivV2XImage带了白边 AutoSizeUtils.dp2px(context, 51f), 0 ) containerImageAndLiveVideo.layoutParams = containerImageAndLiveVideoLayoutParams - contentImageView.setRadius(AutoSizeUtils.dp2px(context, 36f).toFloat()) + contentImageView.setRadius(AutoSizeUtils.dp2px(context, 16f).toFloat()) val tvV2XTimeStrLayoutParams = tvV2XTimeStr.layoutParams as ConstraintLayout.LayoutParams @@ -316,6 +316,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor( } } visibility = View.VISIBLE + bringToFront() UiThreadHandler.postDelayed(dismissRunnable, 10 * 1000L) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_v2n_event_live_play_passenger.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_v2n_event_live_play_passenger.xml index e9dc9a447d..e7f7dab047 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_v2n_event_live_play_passenger.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_v2n_event_live_play_passenger.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_road_v2n_event_window.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_road_v2n_event_window.xml index f13c149fbe..af748a80fc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_road_v2n_event_window.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_road_v2n_event_window.xml @@ -27,7 +27,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent"> - +