From bcddbfc3388fc924604b7f88542a6ef95c54f133 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Fri, 19 Jul 2024 18:54:43 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0][=E4=BA=8B=E4=BB=B6=E5=BC=B9=E6=A1=86]?=
 =?UTF-8?q?=20refactor:=20=E5=8F=B8=E6=9C=BA=E5=B1=8F=20UI=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/taxi_base_fragment.xml    | 21 ++++++++-------
 .../main/res/layout/taxi_p_base_fragment.xml  |  1 +
 .../layout/unmanned_taxi_base_fragment.xml    | 21 ++++++++-------
 .../res/layout/taxt_u_p_base_fragment.xml     |  3 ++-
 .../hmi/ui/v2n/RoadV2NEventWindowView.kt      | 26 ++++++++++++-------
 5 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index 8d7df3aebb..b0533871bc 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -159,6 +159,17 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <!--  事件弹框  -->
+    <com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView
+        android:id="@+id/roadV2NEventWindowView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/dp_45"
+        android:layout_marginTop="@dimen/dp_350"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="gone"/>
+
     <!--自动探查-->
     <com.mogo.och.common.module.wigets.rodedata.OchAutomaticExplorationView
         android:layout_width="wrap_content"
@@ -431,16 +442,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView
-        android:id="@+id/roadV2NEventWindowView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_45"
-        android:layout_marginBottom="@dimen/dp_30"
-        app:layout_constraintBottom_toTopOf="@+id/smallMapView"
-        app:layout_constraintRight_toRightOf="parent"
-        android:visibility="gone"/>
-
     <com.mogo.och.common.module.wigets.LoadingMapStatusView
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
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 9f3240688d..e8cbfbfcff 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
@@ -236,6 +236,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <!--  事件弹框  -->
     <com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView
         android:id="@+id/roadV2NEventWindowView"
         android:layout_width="wrap_content"
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
index 7b989e1200..e00438b7f6 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
@@ -219,6 +219,17 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <!--  事件弹框  -->
+    <com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView
+        android:id="@+id/roadV2NEventWindowView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/dp_45"
+        android:layout_marginTop="@dimen/dp_350"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="gone"/>
+
     <!--自动探查-->
     <com.mogo.och.common.module.wigets.rodedata.OchAutomaticExplorationView
         android:layout_width="wrap_content"
@@ -434,16 +445,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView
-        android:id="@+id/roadV2NEventWindowView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_45"
-        android:layout_marginBottom="@dimen/dp_30"
-        app:layout_constraintBottom_toTopOf="@+id/smallMapView"
-        app:layout_constraintRight_toRightOf="parent"
-        android:visibility="gone"/>
-
     <com.mogo.och.common.module.wigets.LoadingMapStatusView
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
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 f7ee5267fc..2ce34582f8 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
@@ -246,7 +246,8 @@
         android:layout_marginEnd="@dimen/dp_60"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
-    
+
+    <!--  事件弹框  -->
     <com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView
         android:id="@+id/roadV2NEventWindowView"
         android:layout_width="wrap_content"
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 d9c9ac5855..e9679415fd 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
@@ -142,6 +142,10 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
             )
             tvV2XHintContent.layoutParams = tvV2XHintContentLayoutParams
             tvV2XHintContent.setTextColor(Color.parseColor("#131415"))
+            tvV2XHintContent.setTextSize(
+                TypedValue.COMPLEX_UNIT_PX,
+                AutoSizeUtils.dp2px(context, 28f).toFloat()
+            )
             tvV2XHintContent.setPadding(0, 0, 0, AutoSizeUtils.dp2px(context, 28f))
 
             val containerImageAndLiveVideoLayoutParams =
@@ -210,28 +214,32 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
             containerIconHintLayoutParams.width = LayoutParams.MATCH_PARENT
             containerIconHintLayoutParams.height = LayoutParams.WRAP_CONTENT
             containerIconHintLayoutParams.setMargins(
-                AutoSizeUtils.dp2px(context, 30f),
-                AutoSizeUtils.dp2px(context, 31f),
-                AutoSizeUtils.dp2px(context, 30f),
+                AutoSizeUtils.dp2px(context, 30f - 22f),
+                AutoSizeUtils.dp2px(context, 31f - 15f),
+                AutoSizeUtils.dp2px(context, 30f - 22f),
                 0
             )
             containerIconHint.layoutParams = containerIconHintLayoutParams
 
             val ivV2XImageLayoutParams = ivV2XImage.layoutParams as RelativeLayout.LayoutParams
-            ivV2XImageLayoutParams.width = AutoSizeUtils.dp2px(context, 84f)
-            ivV2XImageLayoutParams.height = AutoSizeUtils.dp2px(context, 84f)
+            ivV2XImageLayoutParams.width = AutoSizeUtils.dp2px(context, 84f + 22f + 22f)
+            ivV2XImageLayoutParams.height = AutoSizeUtils.dp2px(context, 84f + 15f + 29f)
             ivV2XImage.layoutParams = ivV2XImageLayoutParams
 
             val tvV2XHintContentLayoutParams =
                 tvV2XHintContent.layoutParams as RelativeLayout.LayoutParams
             tvV2XHintContentLayoutParams.setMargins(
-                AutoSizeUtils.dp2px(context, 32f),
-                0,
-                AutoSizeUtils.dp2px(context, 15f),
+                AutoSizeUtils.dp2px(context, 20f - 22f),
+                AutoSizeUtils.dp2px(context, (42f + 15f) - (46f / 2f)),
+                AutoSizeUtils.dp2px(context, 5f),
                 0
             )
             tvV2XHintContent.layoutParams = tvV2XHintContentLayoutParams
             tvV2XHintContent.setTextColor(Color.parseColor("#FFFFFF"))
+            tvV2XHintContent.setTextSize(
+                TypedValue.COMPLEX_UNIT_PX,
+                AutoSizeUtils.dp2px(context, 32f).toFloat()
+            )
 
             val containerImageAndLiveVideoLayoutParams =
                 containerImageAndLiveVideo.layoutParams as ConstraintLayout.LayoutParams
@@ -239,7 +247,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
             containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 300f)
             containerImageAndLiveVideoLayoutParams.setMargins(
                 AutoSizeUtils.dp2px(context, 30f),
-                AutoSizeUtils.dp2px(context, 30f),
+                AutoSizeUtils.dp2px(context, 30f - 29f),
                 AutoSizeUtils.dp2px(context, 30f),
                 0
             )