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

[6.2.0]

Browse Source 
[B2]
[样式调整]
This commit is contained in:
yangyakun
2023-11-10 17:28:36 +08:00
parent 815d0d25a9
commit 2439813e25
6 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 172 B

After

Width:  |  Height:  |  Size: 179 B

BIN
OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 377 B

After

Width:  |  Height:  |  Size: 608 B

BIN
OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 599 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 818 B

After

Width:  |  Height:  |  Size: 993 B

30
OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
View File

@@ -55,8 +55,8 @@
<ImageView
android:id="@+id/iv_line_icon"
android:layout_width="@dimen/dp_26"
android:layout_height="@dimen/dp_26"
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:layout_marginEnd="@dimen/dp_14"
android:src="@drawable/shuttle_p_line_tile"
app:layout_constraintBottom_toBottomOf="@+id/line_name_tv"
@@ -69,13 +69,13 @@
android:id="@+id/line_name_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_10"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:maxWidth="@dimen/dp_600"
android:singleLine="true"
android:textColor="@color/m2_line_name_tv_color"
android:textSize="@dimen/dp_30"
android:textSize="@dimen/dp_36"
android:textStyle="bold"
app:customGap="0.2"
app:layout_constraintEnd_toEndOf="@+id/iv_line_name_container"
@@ -130,7 +130,7 @@
android:layout_marginTop="@dimen/dp_96"
android:text="@string/shuttle_p_next_station_title"
android:textColor="@color/shuttle_color_203555"
android:textSize="@dimen/dp_30"
android:textSize="@dimen/dp_40"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -139,8 +139,8 @@
app:layout_constraintBottom_toBottomOf="@+id/tv_next_station_title"
app:layout_constraintStart_toEndOf="@+id/tv_next_station_title"
android:id="@+id/iv_animal_list"
android:layout_width="@dimen/dp_25"
android:layout_height="@dimen/dp_30"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_32"
android:src="@drawable/bg_p_m2_arrived_station"
android:visibility="gone"
android:layout_marginStart="@dimen/dp_7" />
@@ -149,14 +149,14 @@
android:id="@+id/station_name_tv"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_6"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:gravity="left"
android:singleLine="true"
android:text="@string/m2_p_empty_tv"
android:textColor="@color/shuttle_color_17417B"
android:textSize="@dimen/dp_46"
android:textSize="@dimen/dp_56"
android:textStyle="bold"
app:customGap="0.2"
app:layout_constraintStart_toStartOf="@+id/tv_next_station_title"
@@ -174,9 +174,9 @@
<View
android:id="@+id/bg_distance_lefttime"
android:layout_width="@dimen/dp_182"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_48"
android:layout_marginTop="@dimen/dp_22"
android:layout_marginTop="@dimen/dp_8"
android:background="@drawable/bg_driving_distance_lefttime"
app:layout_constraintStart_toStartOf="@+id/tv_next_station_title"
app:layout_constraintTop_toBottomOf="@+id/station_name_tv" />
@@ -219,15 +219,15 @@
<TextView
android:id="@+id/tv_arrived_notice"
android:layout_width="@dimen/dp_147"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_48"
android:background="@drawable/bg_driving_arrived_notice"
android:gravity="center"
android:text="@string/m2_p_arrived_station_title"
android:textColor="@color/shuttle_color_34A61F"
android:textStyle="bold"
android:layout_marginTop="@dimen/dp_22"
android:textSize="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_8"
android:textSize="@dimen/dp_26"
android:visibility="gone"
app:layout_constraintStart_toStartOf="@+id/tv_next_station_title"
app:layout_constraintTop_toBottomOf="@+id/station_name_tv" />
@@ -338,7 +338,7 @@
android:format12Hour="HH:mm"
android:format24Hour="HH:mm"
android:gravity="center"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintTop_toTopOf="@+id/aciv_speed_time_bg"
app:layout_constraintStart_toEndOf="@+id/view_split"
android:layout_marginEnd="@dimen/dp_90"

22
OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml
View File

@@ -23,6 +23,7 @@
android:layout_width="1080dp"
android:layout_height="@dimen/dp_612"/>
<ImageView
android:id="@+id/iv_bottom_bg"
android:src="@drawable/m2_bottom_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -67,10 +68,11 @@
android:id="@+id/box_bubble_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/och_shadow_layout"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginLeft="@dimen/dp_42"/>
android:layout_marginBottom="-40dp"
app:layout_constraintBottom_toTopOf="@+id/zv_msg_pop_bottom"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_40"
/>
<!--pnc行为决策-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
@@ -134,6 +136,16 @@
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"/>
<!-- 16 9 -->
<com.mogo.och.common.module.wigets.ZhiView
android:id="@+id/zv_msg_pop_bottom"
android:layout_width="@dimen/dp_240"
android:layout_height="@dimen/dp_240"
android:src="@drawable/charter_p_xiaozhi_normal_00"
android:layout_marginBottom="-70dp"
app:layout_constraintBottom_toTopOf="@+id/video_fragment"
app:layout_constraintEnd_toEndOf="parent" />
<!-- 16 9 -->
<!-- 1000 562.5 -->
</androidx.constraintlayout.widget.ConstraintLayout>