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

[8.1.0]挂载统一红绿灯控件

Browse Source
This commit is contained in:
xuxinchao
2025-06-16 11:52:37 +08:00
parent edc7532bec
commit e102bb6adc
5 changed files with 30 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
View File

@@ -100,15 +100,17 @@
<!--红绿灯-->
<com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
<com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
android:id="@+id/viewTrafficLightVr"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginEnd="@dimen/dp_40"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_21"
android:visibility="gone"
app:lightUser="passenger"
/>
<!--接管提示-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.TakeOverView

13
OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml
View File

@@ -24,15 +24,18 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
<!--红绿灯-->
<com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
android:id="@+id/bus_p_traffic_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_722"
android:layout_marginTop="@dimen/dp_112"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent"
android:layout_marginLeft="@dimen/dp_703"
android:layout_marginTop="@dimen/dp_98"
android:visibility="gone"
app:lightUser="passenger"
/>
<FrameLayout
android:id="@+id/bus_p_route_panel"

21
OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml
View File

@@ -87,30 +87,17 @@
<!-- 红绿灯 -->
<com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
android:id="@+id/traffic_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:visibility="gone"
app:traffic_light_user="traffic_light_taxi_p" />
<!--融合红绿灯-->
<com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView
<com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginEnd="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_26"
android:layout_marginEnd="@dimen/dp_21"
android:visibility="gone"
app:fusionLightUser="passenger_bus"
app:lightUser="passenger"
/>
<com.mogo.och.unmanned.passenger.ui.bar.LeftBarView
android:id="@+id/lbv_go2_center"
app:layout_constraintEnd_toEndOf="parent"

19
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
View File

@@ -41,28 +41,15 @@
android:layout_height="match_parent"/>
<!-- 红绿灯 -->
<com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
android:id="@+id/traffic_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_93"
android:layout_marginEnd="@dimen/dp_40"
android:visibility="gone"
app:layout_constraintEnd_toStartOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:traffic_light_user="traffic_light_taxi_p" />
<!--融合红绿灯-->
<com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView
<com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
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_150"
android:layout_marginTop="@dimen/dp_136"
android:visibility="gone"
app:fusionLightUser="passenger"
app:lightUser="passenger"
/>
<!-- 地图marker点击触发路侧直播 -->

29
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
View File

@@ -78,31 +78,18 @@
app:layout_constraintEnd_toStartOf="@+id/visualAngleToggle"
app:layout_goneMarginEnd="@dimen/dp_50" />
<com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
android:id="@+id/viewTrafficLightVr"
<com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
android:id="@+id/tlvDriver"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
android:visibility="gone"
app:pressed_enabled="false"
android:focusable="false"
android:focusableInTouchMode="false"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView
android:id="@+id/viewFusionTrafficLight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
app:layout_constraintTop_toTopOf="parent"
android:visibility="gone"
app:fusionLightUser="driver"
app:lightUser="driver"
android:focusable="false"
android:focusableInTouchMode="false"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
/>
<!--红绿灯提醒-->
<com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView
@@ -124,8 +111,8 @@
android:layout_height="@dimen/dp_129"
android:layout_marginTop="@dimen/dp_71"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@+id/viewTrafficLightVr"
app:layout_constraintTop_toBottomOf="@+id/viewTrafficLightVr"
app:layout_constraintEnd_toEndOf="@+id/tlvDriver"
app:layout_constraintTop_toBottomOf="@+id/tlvDriver"
android:focusable="false"
android:focusableInTouchMode="false"
app:layout_goneMarginEnd="40dp"