From d749b996289d1c473b0b4c61ed82a363f567e2d7 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 20 Jun 2025 11:30:30 +0800
Subject: [PATCH] =?UTF-8?q?[8.1.0]=20[fea]=20[=E5=85=AC=E4=BA=A4=E7=AB=99?=
 =?UTF-8?q?=E6=8F=90=E9=86=92]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/b1/layout/shuttle_p_weak_jl_base_fragment.xml | 11 +++++++++++
 .../function/hmi/ui/v2n/RoadV2NEventWindowView.kt     |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml
index 7d8eee6561..a4491c052c 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml
+++ b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml
@@ -45,6 +45,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.mogo.eagle.core.function.hmi.ui.msgbox.BusPassengerMsgBoxBubbleView
+        android:id="@+id/bpmsgBubble"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -61,6 +62,16 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="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_marginBottom="-70dp"
+        android:layout_marginRight="14dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/bpmsgBubble"
+        android:visibility="gone"/>
+
     <com.mogo.och.common.module.wigets.LoadingMapStatusView
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
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 7451c5eb3c..7b4c7cf9dd 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
@@ -75,8 +75,8 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
         AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)
     }
 
-    private val isB2 by lazy {
-        AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)
+    private val isB1 by lazy {
+        AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)
     }
 
     private var currentEventUUID: String = ""
@@ -93,7 +93,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
 
     private fun initView() {
         if (isPassengerScreen) {
-            if (isB2) {
+            if (isB1) {
                 setB2PassengerScreenView()
             } else {
                 setTaxiPassengerScreenView()