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

[6.5.0]

Browse Source 
[fea]
[页面调整]
This commit is contained in:
yangyakun
2024-06-27 15:42:03 +08:00
parent 9a29c23e09
commit cf15735d93
2 changed files with 64 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -55,7 +55,7 @@
android:id="@+id/speedView"
android:layout_width="@dimen/dp_240"
android:layout_height="@dimen/dp_120"
android:layout_marginTop="@dimen/dp_100"
android:layout_marginTop="@dimen/dp_110"
android:layout_marginStart="@dimen/dp_50"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -66,7 +66,7 @@
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_60"
android:layout_marginTop="100dp"
android:layout_marginTop="110dp"
android:background="@drawable/taxi_p_bg_roma_selector"
app:layout_constraintStart_toEndOf="@+id/speedView"
app:layout_constraintTop_toTopOf="parent"
@@ -78,18 +78,44 @@
android:layout_width="@dimen/dp_334"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_50"
android:layout_marginTop="100dp"
android:layout_marginTop="110dp"
app:roma_distance_bg="@drawable/taxi_p_roma_distance_bg"
app:layout_constraintLeft_toRightOf="@+id/romaPView"
app:layout_constraintTop_toTopOf="parent"
app:roma_change_dis_color="true" />
<!-- 红绿灯 -->
<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="@+id/rbv_setting_music"
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.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.taxi.passenger.ui.bar.RightBarView
android:id="@+id/rbv_setting_music"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_110"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
android:layout_height="wrap_content"/>
<com.mogo.och.taxi.passenger.ui.bar.LeftBarView
android:id="@+id/lbv_go2_center"
@@ -103,8 +129,8 @@
<com.mogo.och.taxi.passenger.ui.music.MusicView
android:id="@+id/mv_music_info"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_52"
android:layout_marginEnd="@dimen/dp_130"
android:visibility="gone"
android:clickable="true"
@@ -116,34 +142,11 @@
android:layout_width="@dimen/dp_858"
android:layout_height="@dimen/dp_537"
android:layout_marginEnd="@dimen/dp_130"
android:layout_marginTop="@dimen/dp_60"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="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_83"
android:layout_marginRight="@dimen/dp_40"
android:visibility="gone"
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.vehicle.TurnLightViewStatus
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_100"
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.taxi.passenger.ui.orderinfo.ItineraryView
android:id="@+id/itinerary"

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

@@ -54,7 +54,7 @@
android:id="@+id/speedView"
android:layout_width="@dimen/dp_240"
android:layout_height="@dimen/dp_120"
android:layout_marginTop="@dimen/dp_100"
android:layout_marginTop="@dimen/dp_110"
android:layout_marginStart="@dimen/dp_50"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -66,7 +66,7 @@
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_60"
android:layout_marginTop="100dp"
android:layout_marginTop="110dp"
android:background="@drawable/taxt_u_p_roma_bg_selector"
app:layout_constraintStart_toEndOf="@+id/speedView"
app:layout_constraintTop_toTopOf="parent"
@@ -78,18 +78,44 @@
android:layout_width="@dimen/dp_334"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_50"
android:layout_marginTop="100dp"
android:layout_marginTop="110dp"
app:roma_distance_bg="@drawable/taxi_u_p_roma_distance_bg"
app:layout_constraintLeft_toRightOf="@+id/romaPView"
app:layout_constraintTop_toTopOf="parent"
app:roma_change_dis_color="true" />
<!-- 红绿灯 -->
<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="@+id/rbv_setting_music"
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.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.taxi.passenger.ui.bar.RightBarView
android:id="@+id/rbv_setting_music"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_110"
android:layout_marginEnd="@dimen/dp_40"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
android:layout_height="wrap_content"/>
<com.mogo.och.taxi.passenger.ui.bar.LeftBarView
android:id="@+id/lbv_go2_center"
@@ -104,9 +130,9 @@
<com.mogo.och.taxi.passenger.ui.music.MusicView
android:id="@+id/mv_music_info"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_130"
android:layout_marginTop="@dimen/dp_52"
android:visibility="gone"
android:clickable="true"
android:layout_width="@dimen/dp_746"
@@ -117,32 +143,11 @@
android:layout_width="@dimen/dp_858"
android:layout_height="@dimen/dp_537"
android:layout_marginEnd="@dimen/dp_130"
android:layout_marginTop="@dimen/dp_60"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="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_83"
android:layout_marginEnd="@dimen/dp_40"
android:visibility="gone"
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.vehicle.TurnLightViewStatus
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_100"
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