停留在评分页面可以一直停留直到下一单到达上车点直接到手机号后四位验证页面

停留在感谢页面则等待10s后消失、有新订单并到达上车点立马显示手机后四位验证页面
添加关闭按钮

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt

@@ -11,6 +11,7 @@ import android.view.animation.AnimationUtils
 import android.widget.ImageView
 import android.widget.RelativeLayout
 import android.widget.TextView
+import androidx.appcompat.widget.AppCompatImageView
 import com.amap.api.navi.view.PoiInputSearchWidget
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
@@ -54,6 +55,7 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
     private lateinit var ivStarFourth: ImageView
     private lateinit var ivStarFifth: ImageView
     private lateinit var ivAnimalList: ImageView
+    private lateinit var acivClose: AppCompatImageView
     private lateinit var svpFrame: SimpleVideoPlayer
     private var subscribe: Disposable?=null
     private var orderNo = ""
@@ -63,7 +65,6 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
 
     var iTaxiPassengerScoreCallback: ITaxiPassengerScoreCallback?=null
 
-    @Volatile
     var taxiPassengerCommonCallback: ITaxiPassengerCommonCallback?=null
     var left2Right: Animation = AnimationUtils.loadAnimation(
         context, R.anim.left_to_right
@@ -87,6 +88,7 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
         ochShadowLayout = findViewById(R.id.och_shadow_layout)
         ochThankShadowLayout = findViewById(R.id.och_thank_shadow_layout)
         ivAnimalList = findViewById(R.id.iv_animal_list)
+        acivClose = findViewById(R.id.aciv_close)
         svpFrame = findViewById(R.id.svp_frame)
         svpFrame.setBackgroundResource(R.drawable.tail_ani_0000)
         svpFrame.setIsTouchWiget(false)
@@ -105,6 +107,11 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
             false
         }
 
+        acivClose.setOnClickListener {
+            ochShadowLayout.visibility = View.GONE
+            OverlayViewUtils.dismissOverlayView(this@TaxiPassengerArrivedView)
+        }
+
         val url = "android.resource://" + context.packageName + "/" + R.raw.end_video
         gsyVideoOptionBuilder.setUrl(url)
             .setCacheWithPlay(false)

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java

@@ -323,23 +323,9 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
                                           String passengerNum,
                                           String carNumber,
                                           String phone){
-
-        if (mArrivedEndView!=null&&mArrivedEndView.get()!=null&&mArrivedEndView.get().getShowThanks()) {
-            // 正在展示感谢页面
-            synchronized(mArrivedEndView.get()){
-                mArrivedEndView.get().setTaxiPassengerCommonCallback(() -> {
-                    showOrHideArrivedEndLayout(false, "", "");
-                    showOrHidePressengerCheckPager(true, startSiteAddr,
-                            endSiteAddr, passengerNum, carNumber, phone);
-                    mArrivedEndView.get().setTaxiPassengerCommonCallback(null);
-                });
-            }
-        } else {
-            // 正在展示打分页面
-            showOrHideArrivedEndLayout(false, "", "");
-            showOrHidePressengerCheckPager(true, startSiteAddr,
-                    endSiteAddr, passengerNum, carNumber, phone);
-        }
+        showOrHideArrivedEndLayout(false, "", "");
+        showOrHidePressengerCheckPager(true, startSiteAddr,
+                endSiteAddr, passengerNum, carNumber, phone);
     }
 
     /**

OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml

@@ -14,6 +14,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_close"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:src="@drawable/taxi_p_passenger_arrived_close"
+        android:layout_marginEnd="@dimen/dp_70"
+        android:layout_marginTop="@dimen/dp_140"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <com.mogo.och.common.module.wigets.OCHBorderShadowLayout
         android:id="@+id/och_shadow_layout"
         android:layout_width="wrap_content"