From 929690cb4e199584f9bc9ba2691c2c4ed3b3973b Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@ybm100.com>
Date: Wed, 25 May 2022 17:01:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/TaxiPassengerBaseFragment.java         | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

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 6a1cfb8ef5..2aa7613a1e 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
@@ -280,6 +280,9 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
             OverlayViewUtils.showOverlayView(getActivity(),mArrivedEndView.get(),R.style.och_window_anim_alpha);
             mArrivedEndView.get().setDataAndStartAnimation(arrivedEndStation,orderNo);
         }else {
+            if(mArrivedEndView==null||mArrivedEndView.get()==null){
+                return;
+            }
             OverlayViewUtils.dismissOverlayView(mArrivedEndView.get());
         }
     }
@@ -296,20 +299,10 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
             showOrHidePressengerCheckPager(true, startSiteAddr,
                     endSiteAddr, passengerNum, carNumber, phone);
         }else {
-//            if (mArrivedEndView.get().getShowThanks()) {
-//                // 正在展示感谢页面
-//                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);
-//            }
         }
 
 
@@ -334,6 +327,9 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
                 mArrivedCheckView.get().setData(startSiteAddr, endSiteAddr, passengerNum, carNumber,phone);
                 OverlayViewUtils.showOverlayView(getActivity(), mArrivedCheckView.get());
             } else {
+                if(mArrivedCheckView==null||mArrivedCheckView.get()==null){
+                    return;
+                }
                 OverlayViewUtils.dismissOverlayView(mArrivedCheckView.get());
             }
         }catch (Exception e){
@@ -346,7 +342,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
      * @param isSuccess true 打分成功 false 打分失败
      */
     public void showArrivedEndLayout2Thank(boolean isSuccess) {
-        if(mArrivedEndView.get()==null){
+        if(mArrivedEndView==null||mArrivedEndView.get()==null){
             initArrivedView();
         }
         if(isSuccess){