From f1b86b2acfac12ec21913f4bf865a6b4aa9b67e2 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 9 Sep 2022 15:22:26 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=98=B2=E6=AD=A2=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=BC=B9=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/taxi/ui/TaxiFragment.java    | 14 ++++++++++++--
 .../mogo/och/taxi/ui/TaxiLoginDialogFragment.kt    |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
index 305a7372c8..af84d17295 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
@@ -13,6 +13,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.mogo.commons.debug.DebugConfig;
@@ -381,8 +383,15 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
     }
 
     public void showLoginDialogFragment(){
-        CallerLogger.INSTANCE.d(M_TAXI + TAG,"showLoginDialogFragment 展示登录界面");
         CallerHmiManager.INSTANCE.hideToolsView();
+        Fragment fragmentByTag = getParentFragmentManager().findFragmentByTag(TaxiLoginDialogFragment.Companion.getTAG());
+        if(fragmentByTag instanceof DialogFragment){
+            DialogFragment dialogFragment = (DialogFragment)fragmentByTag;
+            if(dialogFragment.getDialog()!=null&&dialogFragment.getDialog().isShowing()){
+                return;
+            }
+        }
+
         if(taxiLoginDialogFragment==null||taxiLoginDialogFragment.get()==null) {
             taxiLoginDialogFragment = new WeakReference<>(TaxiLoginDialogFragment.newInstance());
         }
@@ -394,7 +403,8 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             if (taxiLoginDialog.isAdded()) {//解决方法就是添加这行代码，如果已经添加了，就移除掉然后再show，就不会出现Fragment already added的错误了。
                 getParentFragmentManager().beginTransaction().remove(taxiLoginDialog).commitAllowingStateLoss();
             }
-            taxiLoginDialog.show(getParentFragmentManager(), taxiLoginDialog.getTag());
+            CallerLogger.INSTANCE.d(M_TAXI + TAG,"showLoginDialogFragment 展示登录界面");
+            taxiLoginDialog.show(getParentFragmentManager(), TaxiLoginDialogFragment.Companion.getTAG());
             taxiLoginDialog.setOnDismissListener(dialog -> {
                 taxiLoginDialogFragment.clear();
                 mPresenter.queryLoginStatus();
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt
index e9cd5ce680..1697eee8e7 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt
@@ -230,7 +230,7 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, Taxi
 
 
     companion object {
-        private val TAG = TaxiLoginDialogFragment::class.java.simpleName
+        val TAG = TaxiLoginDialogFragment::class.java.simpleName
 
         @JvmStatic
         fun newInstance(): TaxiLoginDialogFragment {