From 4717484c98d916a938dc20b49b9273686cd63d75 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 14 Sep 2022 11:38:39 +0800
Subject: [PATCH] =?UTF-8?q?[biz]=20=E4=B9=98=E5=AE=A2=E7=AB=AF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF=E4=BB=98=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/comment/TaxiPassengerArrivedView.kt    |  4 ++--
 .../res/layout/taxi_p_arrived_end_panel.xml   | 23 ++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt
index b3335b40ee..55a3ba0a59 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt
@@ -177,7 +177,7 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
         tvFeel.text = ""
         rvCommentList.visibility = View.INVISIBLE
         btnSubmit.visibility = View.INVISIBLE
-        clCommentContain.getLayoutParams().height = 657
+        clCommentContain.getLayoutParams().height = 748
         clCommentContain.requestLayout()
         super.onDetachedFromWindow()
         subscribe?.let {
@@ -305,7 +305,7 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
 
     private fun startChangeHeightAnimarion() {
         // 815 除了 点评的高度
-        val resizeAnimation = ResizeAnimation(clCommentContain,832+rvCommentList.height, clCommentContain.height)
+        val resizeAnimation = ResizeAnimation(clCommentContain,923+rvCommentList.height, clCommentContain.height)
         resizeAnimation.duration = 300
         resizeAnimation.setAnimationListener(object :Animation.AnimationListener{
             override fun onAnimationStart(animation: Animation?) {
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
index f07f9b6bb4..2a5872ee2b 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
@@ -44,7 +44,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_comment_contain"
             android:layout_width="@dimen/dp_867"
-            android:layout_height="@dimen/dp_657"
+            android:layout_height="@dimen/dp_748"
             app:layout_constraintBottom_toBottomOf="parent"
             android:background="@drawable/bg_taxi_p_arrived_info"
             app:layout_constraintStart_toStartOf="parent">
@@ -57,6 +57,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
             <ImageView
+                android:id="@+id/iv_bottom_light"
                 app:layout_constraintBottom_toBottomOf="parent"
                 android:src="@drawable/taxi_p_arrived_end_light"
                 app:layout_constraintStart_toStartOf="parent"
@@ -94,14 +95,30 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 android:layout_marginTop="@dimen/dp_31"
                 android:includeFontPadding="false"
-                android:textColor="@android:color/white"
+                android:textColor="@color/taxi_p_route_txt_color"
                 android:textSize="@dimen/dp_56"
                 android:textStyle="bold"
                 tools:text="环球贸易中心-北门"/>
 
+            <TextView
+                android:id="@+id/arrived_end_wx_pay"
+                android:layout_width="0dp"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@+id/arrived_end_station"
+                app:layout_constraintStart_toStartOf="@+id/arrived_end_station"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginTop="@dimen/dp_31"
+                android:includeFontPadding="false"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/dp_46"
+                android:textStyle="bold"
+                android:text="行程结束，请在小程序端完成支付!"/>
+
             <View
                 android:id="@+id/v_line"
-                app:layout_constraintTop_toBottomOf="@+id/arrived_end_station"
+                app:layout_constraintTop_toBottomOf="@+id/arrived_end_wx_pay"
                 android:layout_marginTop="@dimen/dp_49"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"