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

[6.7.0]BUS乘客端增加红绿灯和红绿灯提醒View

Browse Source
This commit is contained in:
xuxinchao
2024-10-14 15:44:25 +08:00
parent 85adbfeeef
commit a616838566
5 changed files with 75 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
View File

@@ -102,6 +102,29 @@
app:layout_constraintTop_toTopOf="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"
/>
<!--融合红绿灯-->
<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"
/>
<!-- 地图marker点击触发路侧直播 -->
<com.mogo.eagle.core.function.hmi.ui.camera.RoadCrossLiveView
android:layout_width="@dimen/dp_800"

23
OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml
View File

@@ -157,6 +157,29 @@
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"
/>
<!--融合红绿灯-->
<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_bug_b2_p_version"
app:layout_constraintBottom_toBottomOf="parent"

23
OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
View File

@@ -111,6 +111,29 @@
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_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"
/>
<!--接管提示-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.TakeOverView
android:layout_width="@dimen/hmi_take_over_request_width"

2
OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml
View File

@@ -165,6 +165,7 @@
app:layout_constraintBottom_toTopOf="@id/zv_msg_pop_bottom"
app:layout_constraintEnd_toEndOf="parent"
app:promptUser="passenger_bus"
android:visibility="gone"
/>
<!--融合红绿灯-->
@@ -176,6 +177,7 @@
app:layout_constraintTop_toBottomOf="@id/och_shadow_layout"
android:layout_marginTop="@dimen/dp_30"
app:fusionLightUser="passenger_bus"
android:visibility="gone"
/>

8
core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml
View File

@@ -10,12 +10,13 @@
<com.mogo.eagle.core.function.hmi.ui.widget.ProportionChartView
android:id="@+id/fusionTrafficLightProportion"
android:layout_width="@dimen/dp_113"
android:layout_height="@dimen/dp_113"
android:layout_width="@dimen/dp_124"
android:layout_height="@dimen/dp_124"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:ringWidth="@dimen/dp_5"
/>
<ImageView
@@ -47,7 +48,7 @@
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
app:layout_constraintCircle="@id/fusionTrafficLightState"
app:layout_constraintCircleRadius="@dimen/dp_46"
app:layout_constraintCircleRadius="@dimen/dp_44"
android:src="@drawable/icon_light_green_pointer_p_bus"
android:contentDescription="@string/fusion_traffic_light_pointer"
tools:ignore="MissingConstraints"
@@ -64,7 +65,6 @@
android:textColor="#063330"
android:textSize="@dimen/sp_42"
app:textType="DS_DIGIB_2"
android:text="10"
/>
</androidx.constraintlayout.widget.ConstraintLayout>