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

停留在感谢页面则等待10s后消失、若10s内下一单到达上车点 需等到10s结束展示手机号后四位验证页面

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

@@ -14,6 +14,7 @@ import android.widget.TextView
 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
+import com.mogo.eagle.core.utilcode.util.OverlayViewUtils
 import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer
 import com.mogo.och.common.module.wigets.OCHBorderShadowLayout
 import com.mogo.och.taxi.passenger.R
@@ -62,6 +63,7 @@ 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
@@ -281,7 +283,13 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe {
                 // 正在展示感谢页面
-                taxiPassengerCommonCallback?.onCommonCallback()
+                if (taxiPassengerCommonCallback == null) {
+                    // 没有用户确定页面
+                    OverlayViewUtils.dismissOverlayView(this@TaxiPassengerArrivedView)
+                } else {
+                    // 有排队展示的用户确定页面
+                    taxiPassengerCommonCallback?.onCommonCallback()
+                }
             }
     }
 

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

@@ -294,11 +294,23 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
                                           String passengerNum,
                                           String carNumber,
                                           String phone){
-        // 正在展示打分页面或者正在展示感谢页面
-        showOrHideArrivedEndLayout(false, "","");
-        showOrHidePressengerCheckPager(true, startSiteAddr,
-                endSiteAddr, passengerNum, carNumber, 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);
+        }
     }
 
     /**