yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d_241202_6.8.2_video_test' into dev_robotaxi-d_241202_6.8.2

Browse Source
This commit is contained in:
xyz
2024-12-20 10:03:44 +08:00
parent 0bc223ab3b 33e474ea7f
commit ae17dec5c4
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_fragment.xml
View File

@@ -146,39 +146,39 @@
app:layout_constraintBottom_toTopOf="@+id/video_fragment"
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_marginBottom="-70dp"
android:layout_marginRight="14dp"
app:layout_constraintBottom_toTopOf="@+id/zv_msg_pop_bottom"
app:layout_constraintRight_toRightOf="parent"
android:visibility="gone"/>
<!-- &lt;!&ndash; 事件弹框 &ndash;&gt;-->
<!-- <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_constraintBottom_toTopOf="@+id/zv_msg_pop_bottom"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- android:visibility="gone"/>-->
<!--红绿灯提醒-->
<com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_m_70"
app:layout_constraintBottom_toTopOf="@id/zv_msg_pop_bottom"
app:layout_constraintEnd_toEndOf="parent"
app:promptUser="passenger_bus"
android:visibility="gone"
/>
<!-- &lt;!&ndash;红绿灯提醒&ndash;&gt;-->
<!-- <com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginBottom="@dimen/dp_m_70"-->
<!-- app:layout_constraintBottom_toTopOf="@id/zv_msg_pop_bottom"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:promptUser="passenger_bus"-->
<!-- android:visibility="gone"-->
<!-- />-->
<!--融合红绿灯-->
<com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/och_shadow_layout"
android:layout_marginTop="@dimen/dp_30"
app:fusionLightUser="passenger_bus"
android:visibility="gone"
/>
<!-- &lt;!&ndash;融合红绿灯&ndash;&gt;-->
<!-- <com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@id/och_shadow_layout"-->
<!-- android:layout_marginTop="@dimen/dp_30"-->
<!-- app:fusionLightUser="passenger_bus"-->
<!-- android:visibility="gone"-->
<!-- />-->
<TextView
android:id="@+id/tv_shuttle_b2_p_version"