From af63eb3db91480663de91806fa61a352fc94eb2e Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 28 Dec 2023 18:07:52 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.6]=20[taxi-p]=20[=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E5=AD=97=E6=95=B0=E9=99=90=E5=88=B6=E6=94=BE=E5=A4=A7?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt | 4 ++-- OCH/taxi/passenger/src/main/res/layout/taxi_p_itinerary.xml | 2 +- .../com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt | 4 ++-- .../src/main/res/layout/taxt_u_p_itinerary.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt index 415faa3582..d5a786611d 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt @@ -86,8 +86,8 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback } override fun setEndStation(endStation:String){ - if(endStation.length>9){ - actv_endstation.text = "${endStation.subSequence(0,9)}…" + if(endStation.length>15){ + actv_endstation.text = "${endStation.subSequence(0,15)}…" }else { actv_endstation.text = endStation } diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_itinerary.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_itinerary.xml index 5fdb3b1e1a..cffacb535e 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_itinerary.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_itinerary.xml @@ -46,7 +46,7 @@ android:id="@+id/actv_endstation" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:maxLength="10" + android:maxLength="25" android:maxLines="1" android:layout_marginStart="@dimen/dp_7" android:textColor="@color/taxi_p_293449" diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt index de2a33f9fb..f463e62346 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt @@ -90,8 +90,8 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback } override fun setEndStation(endStation:String){ - if(endStation.length>9){ - actv_endstation.text = "${endStation.subSequence(0,9)}…" + if(endStation.length>15){ + actv_endstation.text = "${endStation.subSequence(0,15)}…" }else { actv_endstation.text = endStation } diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_itinerary.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_itinerary.xml index 817fd4263c..b52a6b518d 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_itinerary.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_itinerary.xml @@ -46,7 +46,7 @@ android:id="@+id/actv_endstation" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:maxLength="10" + android:maxLength="25" android:maxLines="1" android:layout_marginStart="@dimen/dp_7" android:textColor="@color/taxi_p_293449"