Merge branch 'dev_robotaxi-d_250603_8.1.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_250603_8.1.0

This commit is contained in:
xinfengkun
2025-06-18 18:04:41 +08:00

View File

@@ -40,18 +40,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<!-- 红绿灯 -->
<com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
android:id="@+id/traffic_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_136"
android:visibility="gone"
app:lightUser="passenger"
/>
<!-- 地图marker点击触发路侧直播 -->
<com.mogo.eagle.core.function.hmi.ui.camera.RoadCrossLiveView
@@ -62,29 +50,6 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--红绿灯提醒-->
<com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_50"
android:layout_marginBottom="-80dp"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:visibility="gone"
app:promptUser="passenger"
/>
<!--转向灯-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_110"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintRight_toLeftOf="@id/traffic_light_view"
app:layout_constraintTop_toTopOf="parent"
app:user="taxi_p" />
<!-- 路程信息 -->
<com.mogo.och.unmanned.passenger.ui.orderinfo.ItineraryView