From cd8564208410c7b01038e1fab3e307d55a5f1813 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 13 Jun 2022 11:18:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E7=95=99=E5=9C=A8=E8=AF=84=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=AF=E4=BB=A5=E4=B8=80=E7=9B=B4=E5=81=9C?=
 =?UTF-8?q?=E7=95=99=E7=9B=B4=E5=88=B0=E4=B8=8B=E4=B8=80=E5=8D=95=E5=88=B0?=
 =?UTF-8?q?=E8=BE=BE=E4=B8=8A=E8=BD=A6=E7=82=B9=E7=9B=B4=E6=8E=A5=E5=88=B0?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=90=8E=E5=9B=9B=E4=BD=8D=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E9=A1=B5=E9=9D=A2=20=E5=81=9C=E7=95=99=E5=9C=A8?=
 =?UTF-8?q?=E6=84=9F=E8=B0=A2=E9=A1=B5=E9=9D=A2=E5=88=99=E7=AD=89=E5=BE=85?=
 =?UTF-8?q?10s=E5=90=8E=E6=B6=88=E5=A4=B1=E3=80=81=E8=8B=A510s=E5=86=85?=
 =?UTF-8?q?=E4=B8=8B=E4=B8=80=E5=8D=95=E5=88=B0=E8=BE=BE=E4=B8=8A=E8=BD=A6?=
 =?UTF-8?q?=E7=82=B9=20=E9=9C=80=E7=AD=89=E5=88=B010s=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=90=8E=E5=9B=9B?=
 =?UTF-8?q?=E4=BD=8D=E9=AA=8C=E8=AF=81=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/ui/TaxiPassengerArrivedView.kt  | 10 +++++++++-
 .../ui/TaxiPassengerBaseFragment.java         | 20 +++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt
index f92da8f1ee..e997ec745c 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt
+++ b/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()
+                }
             }
     }
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
index fc1e9c5c6f..f427967109 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
+++ b/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);
+        }
     }
 
     /**