From 8b9a0214a2cba09cc080d2fa0adfc31b451501fd Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 5 Jan 2024 14:40:29 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.6]=20[taxi=5Fp]=20[=E8=B7=9D=E7=A6=BB?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/orderinfo/ItineraryView.kt | 29 +++++++++++-------- .../src/main/res/layout/taxi_p_itinerary.xml | 2 +- .../passenger/src/main/res/values/colors.xml | 2 +- .../passenger/ui/orderinfo/ItineraryView.kt | 29 +++++++++++-------- .../main/res/layout/taxt_u_p_itinerary.xml | 2 +- .../src/main/res/values/colors.xml | 2 +- 6 files changed, 38 insertions(+), 28 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 d5a786611d..3773c8cb43 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 @@ -55,7 +55,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback gradientDrawable.cornerRadii = floatArrayOf(0f, 0f, 0f, 0f, corner, corner, corner, corner) } - val firstColor = ContextCompat.getColor(context, R.color.taxi_p_OF5FFF) + val firstColor = ContextCompat.getColor(context, R.color.taxi_p_0F5FFF) val setondColor = ContextCompat.getColor(context, R.color.taxi_p_44C8FF) val thirdColor = ContextCompat.getColor(context, R.color.taxi_p_8AE4ED) val fourceColor = ContextCompat.getColor(context, R.color.taxi_p_C8F3F4) @@ -95,6 +95,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback var prePercentage = 0f val needChangeStyleNumber = 0.99 + val needChangeStyleNumberMin = 0.03f override fun setDistanceInfo(surplusdistance:String,distanceUnit:String, surplusTime:String,surplusTimeUnit:String, @@ -113,18 +114,22 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback } val currentPercentage = alreadyGone.toFloat() / stationDistance - if((prePercentage>needChangeStyleNumber) xor (currentPercentage>needChangeStyleNumber)){ - if(currentPercentage>needChangeStyleNumber){ - setDrawable(false) - }else{ - setDrawable(true) - } - progress_distance.progress = alreadyGone - }else{ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - progress_distance.setProgress(alreadyGone,true) - }else{ + if(currentPercentage>0&¤tPercentage needChangeStyleNumber) xor (currentPercentage > needChangeStyleNumber)) { + if (currentPercentage > needChangeStyleNumber) { + setDrawable(false) + } else { + setDrawable(true) + } progress_distance.progress = alreadyGone + } else { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + progress_distance.setProgress(alreadyGone, true) + } else { + progress_distance.progress = alreadyGone + } } } prePercentage = currentPercentage 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 cffacb535e..0c48cb0976 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 @@ -63,7 +63,7 @@ android:layout_width="0dp" android:gravity="center" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_50" + android:layout_marginTop="@dimen/dp_80" android:layout_marginBottom="@dimen/dp_66" android:layout_marginStart="@dimen/dp_58" android:textSize="@dimen/dp_61" diff --git a/OCH/taxi/passenger/src/main/res/values/colors.xml b/OCH/taxi/passenger/src/main/res/values/colors.xml index 2909e9d876..fdb2587742 100644 --- a/OCH/taxi/passenger/src/main/res/values/colors.xml +++ b/OCH/taxi/passenger/src/main/res/values/colors.xml @@ -22,7 +22,7 @@ #66476FBE #41444D - #0F5FFF + #0F5FFF #44C8FF #8AE4ED #C8F3F4 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 f463e62346..654b8aae8c 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 @@ -59,7 +59,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback gradientDrawable.cornerRadii = floatArrayOf(0f, 0f, 0f, 0f, corner, corner, corner, corner) } - val firstColor = ContextCompat.getColor(context, R.color.taxi_p_OF5FFF) + val firstColor = ContextCompat.getColor(context, R.color.taxi_p_0F5FFF) val setondColor = ContextCompat.getColor(context, R.color.taxi_p_44C8FF) val thirdColor = ContextCompat.getColor(context, R.color.taxi_p_8AE4ED) val fourceColor = ContextCompat.getColor(context, R.color.taxi_p_C8F3F4) @@ -99,6 +99,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback var prePercentage = 0f val needChangeStyleNumber = 0.99 + val needChangeStyleNumberMin = 0.03f override fun setDistanceInfo(surplusdistance:String,distanceUnit:String, surplusTime:String,surplusTimeUnit:String, @@ -117,18 +118,22 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback } val currentPercentage = alreadyGone.toFloat() / stationDistance - if((prePercentage>needChangeStyleNumber) xor (currentPercentage>needChangeStyleNumber)){ - if(currentPercentage>needChangeStyleNumber){ - setDrawable(false) - }else{ - setDrawable(true) - } - progress_distance.progress = alreadyGone - }else{ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - progress_distance.setProgress(alreadyGone,true) - }else{ + if(currentPercentage>0&¤tPercentage needChangeStyleNumber) xor (currentPercentage > needChangeStyleNumber)) { + if (currentPercentage > needChangeStyleNumber) { + setDrawable(false) + } else { + setDrawable(true) + } progress_distance.progress = alreadyGone + } else { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + progress_distance.setProgress(alreadyGone, true) + } else { + progress_distance.progress = alreadyGone + } } } prePercentage = currentPercentage 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 b52a6b518d..8190e1fee5 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 @@ -63,7 +63,7 @@ android:layout_width="0dp" android:gravity="center" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_50" + android:layout_marginTop="@dimen/dp_80" android:layout_marginBottom="@dimen/dp_66" android:layout_marginStart="@dimen/dp_58" android:textSize="@dimen/dp_61" diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml index 864853f159..59672dcfdf 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml @@ -30,7 +30,7 @@ #56efa0 #A7BDF3 #41444D - #0F5FFF + #0F5FFF #44C8FF #8AE4ED #C8F3F4