From 6b7a8a748562d935a5f400135931294cf4163ec5 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 27 Sep 2022 17:29:12 +0800
Subject: [PATCH] =?UTF-8?q?[2110]=20=E8=AF=84=E4=BB=B7=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=AE=E6=94=B9=E3=80=81=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/comment/TaxiPassengerArrivedView.kt    | 10 +++++--
 .../ui/comment/adapter/CommentAdapter.kt      | 13 +++++++++
 .../res/layout/taxi_p_arrived_end_panel.xml   | 27 ++++++++++---------
 3 files changed, 35 insertions(+), 15 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 55a3ba0a59..6f56314a9f 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
@@ -305,18 +305,24 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
 
     private fun startChangeHeightAnimarion() {
         // 815 除了 点评的高度
-        val resizeAnimation = ResizeAnimation(clCommentContain,923+rvCommentList.height, clCommentContain.height)
+        val resizeAnimation = ResizeAnimation(clCommentContain,913+rvCommentList.height, clCommentContain.height)
         resizeAnimation.duration = 300
         resizeAnimation.setAnimationListener(object :Animation.AnimationListener{
             override fun onAnimationStart(animation: Animation?) {
                 rvCommentList.visibility = View.VISIBLE
-                btnSubmit.visibility = View.VISIBLE
             }
 
             override fun onAnimationEnd(animation: Animation?) {
                 allStartOrdered.forEach {
                     it.isEnabled = true
                 }
+                if(btnSubmit.visibility==View.GONE||btnSubmit.visibility==View.INVISIBLE) {
+                    btnSubmit.visibility = View.VISIBLE
+                    val showAnimator = ObjectAnimator.ofFloat(btnSubmit, "alpha", 0.1f, 1f)
+                    showAnimator.duration = 600
+                    showAnimator.start()
+                }
+
             }
 
             override fun onAnimationRepeat(animation: Animation?) {
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/adapter/CommentAdapter.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/adapter/CommentAdapter.kt
index ccd4886280..71334c1f80 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/adapter/CommentAdapter.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/adapter/CommentAdapter.kt
@@ -19,6 +19,19 @@ class CommentAdapter(private val context: Context?,private val itemDataList: Mut
     fun addAll(itemDataList: MutableList<TaxiPassengerStarWorld>){
         this.itemDataList.clear()
         this.itemDataList.addAll(itemDataList)
+        // region 临时代码
+        var needMove:TaxiPassengerStarWorld?=null
+        itemDataList.forEachIndexed { index, taxiPassengerStarWorld ->
+            if(taxiPassengerStarWorld.labelInfo=="频繁急停急刹"){
+                needMove = taxiPassengerStarWorld
+                return@forEachIndexed
+            }
+        }
+        needMove?.let {
+            this.itemDataList.remove(it)
+            this.itemDataList.add(this.itemDataList.size-1,it)
+        }
+        // endregion
         this.notifyDataSetChanged()
     }
     fun getSelectComment(): List<TaxiPassengerStarWorld> {
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 2a5872ee2b..0f8835bef9 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
@@ -29,7 +29,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_109"
-        android:layout_marginBottom="@dimen/dp_110"
+        android:layout_marginBottom="@dimen/dp_30"
         app:bgColor="@color/taxi_p_map_bg"
         app:blurRadius="@dimen/dp_60"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -56,15 +56,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 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"
-                android:rotation="180"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+
             <View
                 android:id="@+id/bg_taxi_p_arrived_info_yello_v"
                 app:layout_constraintStart_toStartOf="parent"
@@ -226,16 +218,25 @@
                 android:gravity="center"
                 android:visibility="invisible"
                 android:textColor="@color/taxi_order_status_textColor"
-                app:layout_constraintTop_toBottomOf="@+id/rv_comment_list"
+                app:layout_constraintBottom_toTopOf="@+id/iv_bottom_light"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 android:background="@drawable/taxi_p_comment_submit"
                 android:textSize="@dimen/sp_42"
                 android:height="120px"
-                android:layout_marginTop="33px"
                 android:layout_width="450px"
                 android:layout_height="wrap_content"/>
 
+            <ImageView
+                android:id="@+id/iv_bottom_light"
+                android:layout_width="match_parent"
+                android:layout_height="95px"
+                android:rotation="180"
+                android:src="@drawable/taxi_p_arrived_end_light"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.mogo.och.common.module.wigets.OCHBorderShadowLayout>
 
@@ -245,7 +246,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_109"
-        android:layout_marginBottom="@dimen/dp_110"
+        android:layout_marginBottom="@dimen/dp_30"
         app:bgColor="@color/taxi_p_map_bg"
         app:blurRadius="@dimen/dp_60"
         app:layout_constraintBottom_toBottomOf="parent"