From 331e95de0dcb59544db1f5f393c5f2a94b49fce8 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 6 Dec 2023 14:19:59 +0800 Subject: [PATCH] [6.2.6] [shuttle-jl] [rename] --- .../BusPassengerLineStationsAdapter.java | 32 ++++---- .../ui/BusPassengerRouteFragment.java | 26 +++---- .../ui/BusPassengerTrafficLightView.kt | 6 +- .../shuttle_p_jl_bg_end_station_circle.xml | 4 +- .../shuttle_p_jl_bg_middle_station_circle.xml | 4 +- .../shuttle_p_jl_bg_start_station_circle.xml | 4 +- ...uttle_p_jl_bg_traffic_light_background.xml | 8 +- .../shuttle_p_jl_no_data_common_view.xml | 6 +- .../layout/shuttle_p_jl_route_fragment.xml | 48 ++++++------ .../shuttle_p_jl_stations_common_item.xml | 4 +- .../shuttle_p_jl_traffic_light_view.xml | 18 ++--- .../src/main/res/jinlv/values/colors.xml | 51 +++++-------- .../src/main/res/jinlv/values/dimens.xml | 76 +++++-------------- .../src/main/res/jinlv/values/strings.xml | 18 ++--- 14 files changed, 124 insertions(+), 181 deletions(-) diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java index 93812807b7..9c572e7f85 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java @@ -56,14 +56,14 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter - - + + diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml index 4dca66c4fe..13b479db48 100644 --- a/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml @@ -1,6 +1,6 @@ - - + + diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml index 97458b6d07..2516df8c8e 100644 --- a/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml @@ -1,6 +1,6 @@ - - + + diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml index 6382b0256a..4982506777 100644 --- a/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml @@ -2,8 +2,8 @@ - - - + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_no_data_common_view.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_no_data_common_view.xml index 529440e5de..8240758212 100644 --- a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_no_data_common_view.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_no_data_common_view.xml @@ -24,12 +24,12 @@ android:id="@+id/no_order_data_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/bus_p_speed_txt_color" - android:textSize="@dimen/bus_p_no_data_size" + android:textColor="@color/shuttle_p_jl_speed_txt_color" + android:textSize="@dimen/shuttle_p_jl_no_data_size" android:layout_marginTop="50dp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/no_order_data_iv" - android:text="@string/bus_p_no_out"/> + android:text="@string/shuttle_p_jl_no_out"/> \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml index a4d9975b39..6b44d9a4cb 100644 --- a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml @@ -1,7 +1,7 @@ @@ -21,7 +21,7 @@ app:yOffset="0dp"/> @@ -91,12 +91,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_10" - android:layout_marginRight="@dimen/bus_p_route_info_margin_right" + android:layout_marginRight="@dimen/shuttle_p_jl_route_info_margin_right" android:layout_marginBottom="@dimen/dp_20" android:includeFontPadding="false" - android:text="@string/bus_p_speed_unit_txt" - android:textColor="@color/bus_p_speed_txt_color" - android:textSize="@dimen/bus_p_speed_unit_txt_size" + android:text="@string/shuttle_p_jl_speed_unit_txt" + android:textColor="@color/shuttle_p_jl_speed_txt_color" + android:textSize="@dimen/shuttle_p_jl_speed_unit_txt_size" app:layout_constraintBottom_toBottomOf="@+id/bus_p_speed_tv" app:layout_constraintLeft_toRightOf="@+id/bus_p_speed_tv" /> @@ -123,7 +123,7 @@ android:layout_width="@dimen/dp_1" android:layout_height="@dimen/dp_156" android:layout_marginTop="@dimen/dp_110" - android:background="@color/bus_p_clock_6617417B" + android:background="@color/shuttle_p_jl_clock_6617417B" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -137,7 +137,7 @@ android:format24Hour="HH:mm" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/bus_p_clock_17417B" + android:textColor="@color/shuttle_p_jl_clock_17417B" android:textSize="@dimen/dp_66" app:layout_constraintBottom_toBottomOf="@+id/bus_p_speed_tv" app:layout_constraintLeft_toRightOf="@+id/dividing_line_1" @@ -152,7 +152,7 @@ android:format24Hour="yyyy年MM月dd日" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/bus_p_clock_17417B" + android:textColor="@color/shuttle_p_jl_clock_17417B" android:textSize="@dimen/dp_26" app:layout_constraintLeft_toLeftOf="@+id/textClockHourMin" app:layout_constraintTop_toBottomOf="@+id/textClockHourMin" /> @@ -167,7 +167,7 @@ android:format24Hour="EEEE" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/bus_p_clock_17417B" + android:textColor="@color/shuttle_p_jl_clock_17417B" android:textSize="@dimen/dp_26" app:layout_constraintLeft_toLeftOf="@+id/textClockDate" app:layout_constraintTop_toBottomOf="@+id/textClockDate" /> @@ -188,8 +188,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_104" - android:text="@string/bus_p_cur_station_title" - android:textColor="@color/bus_p_line_name_color" + android:text="@string/shuttle_p_jl_cur_station_title" + android:textColor="@color/shuttle_p_jl_line_name_color" android:textSize="@dimen/dp_38" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="@+id/bus_p_speed_tv" @@ -213,7 +213,7 @@ android:gravity="center" android:paddingLeft="@dimen/dp_30" android:paddingRight="@dimen/dp_30" - android:text="@string/bus_p_cur_station_arrived_tip" + android:text="@string/shuttle_p_jl_cur_station_arrived_tip" android:textColor="@android:color/white" android:textSize="@dimen/dp_30" android:textStyle="bold" @@ -227,7 +227,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_36" android:text="-- --" - android:textColor="@color/bus_p_clock_17417B" + android:textColor="@color/shuttle_p_jl_clock_17417B" android:textSize="@dimen/dp_56" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_title" @@ -247,7 +247,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:paddingLeft="@dimen/dp_30" - android:paddingRight="@dimen/bus_p_route_info_margin_right" + android:paddingRight="@dimen/shuttle_p_jl_route_info_margin_right" android:paddingBottom="@dimen/dp_20" android:requiresFadingEdge="vertical" app:layout_constraintBottom_toBottomOf="parent" @@ -267,8 +267,8 @@ diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_stations_common_item.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_stations_common_item.xml index 655d9bc84e..60d2419315 100644 --- a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_stations_common_item.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_stations_common_item.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="--" - android:textSize="@dimen/bus_p_station_txt_size" + android:textSize="@dimen/shuttle_p_jl_station_txt_size" android:includeFontPadding = "false" android:singleLine="true" android:ellipsize="marquee" @@ -17,7 +17,7 @@ android:layout_marginRight="@dimen/dp_60" android:layout_marginTop="@dimen/dp_68" android:textStyle="bold" - android:textColor="@color/bus_p_station_txt_color" + android:textColor="@color/shuttle_p_jl_station_txt_color" android:layout_marginLeft="@dimen/dp_90" app:customGap="0.5" app:useCustomGap="true" diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_traffic_light_view.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_traffic_light_view.xml index 645b0e5cfb..41eacc318b 100644 --- a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_traffic_light_view.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_traffic_light_view.xml @@ -2,22 +2,22 @@ diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/values/colors.xml b/OCH/shuttle/passenger/src/main/res/jinlv/values/colors.xml index 4bcd3db004..6620187e95 100644 --- a/OCH/shuttle/passenger/src/main/res/jinlv/values/colors.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/values/colors.xml @@ -1,41 +1,24 @@ - #5D7199 - #CCE9EFFC - #C7D2E1 - #2D3E5F - #203555 - #2D3E5F - #596A8A - #D8E5F8 - #FFB327 - #2D3E5F - #0043FF - #276AFE - #0043FF - #276AFE - #FFC125 - #FF8131 - #31BFF2 - #3257E9 - #FFFFFF - #CDDBF6 - #2D3E5F - #0043FF - #2D3E5F - #E6E9EFFC - #33394C63 - #2D3E5F - #33394C63 + #5D7199 + #CCE9EFFC + #C7D2E1 + #203555 + #FFB327 + #2D3E5F + #276AFE + #CDDBF6 + #2D3E5F + #2D3E5F - #43CEFE - #1466FB + #43CEFE + #1466FB - #17417B - #6617417B - #A9B6CA - #1F82FB + #17417B + #6617417B + #A9B6CA + #1F82FB - #992D3E5F + #992D3E5F \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/values/dimens.xml b/OCH/shuttle/passenger/src/main/res/jinlv/values/dimens.xml index 7e055aedf1..07076fd91d 100644 --- a/OCH/shuttle/passenger/src/main/res/jinlv/values/dimens.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/values/dimens.xml @@ -1,65 +1,29 @@ - 750dp - 804dp - 40dp - 40dp - 48dp - 40dp - 110dp - 224dp - 422dp - 3dp + 750dp + 804dp + 40dp + 48dp + 422dp - 158dp - 90dp - 45dp - 158dp - 90dp - 45dp - 90dp - 90dp - 3dp + 158dp + 90dp + 45dp + 158dp + 90dp + 45dp + 90dp + 90dp + 3dp - 224dp - 50dp - 50dp - 34dp - 130dp - 38dp + 34dp - 38dp + 38dp - 90dp - 27dp + 90dp + 27dp - 4dp - 10dp - 20dp - 60dp - 30dp - 20dp - 50dp - 6dp - 38dp - 36dp - 80dp - 100dp - 80dp - 60dp - 6dp + 10dp + 38dp - 685dp - 309dp - 50dp - 10dp - 44dp - 55dp - 40dp - - 495dp - 309dp - - 584dp - 550dp \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/values/strings.xml b/OCH/shuttle/passenger/src/main/res/jinlv/values/strings.xml index cf8142edc1..4170e113bf 100644 --- a/OCH/shuttle/passenger/src/main/res/jinlv/values/strings.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/values/strings.xml @@ -1,14 +1,10 @@ - KM/H - 您已收车 - 暂无班次 - 暂无线路 - - - 已到站: - 前方到站: - - 请按秩序下车 - + KM/H + 您已收车 + 暂无班次 + 暂无线路 + 已到站: + 前方到站: + 请按秩序下车 \ No newline at end of file