From a2c5a46a9686af1a621da7d344122e8bdf8bd5d5 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 31 Aug 2022 16:24:21 +0800
Subject: [PATCH] =?UTF-8?q?[2.10.0]=20toast=E6=8E=A7=E5=88=B6cod=E3=80=81?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AEdialogfragment=20=E6=98=BE=E7=A4=BAAndroidx?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/common/module/utils/ToastUtilsOch.java | 17 +++++++++++++++++
 .../com/mogo/och/taxi/model/TaxiModel.java     | 18 +++++++++---------
 .../och/taxi/ui/TaxiLoginDialogFragment.kt     | 12 +++++++++++-
 3 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java

diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java
new file mode 100644
index 0000000000..829093f3a7
--- /dev/null
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java
@@ -0,0 +1,17 @@
+package com.mogo.och.common.module.utils;
+
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.utilcode.util.ToastUtils;
+
+public class ToastUtilsOch {
+    public static void showWithCodeMessage(int code,String message){
+        if(message==null){
+            return;
+        }
+        if (DebugConfig.isDebug()) {
+            ToastUtils.showShort(code+","+message);
+        }else {
+            ToastUtils.showShort(message);
+        }
+    }
+}
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 002a14dc61..a173d00020 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -36,6 +36,7 @@ import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.common.module.utils.PinYinUtil;
+import com.mogo.och.common.module.utils.ToastUtilsOch;
 import com.mogo.och.taxi.R;
 import com.mogo.och.taxi.bean.DriverServiceDataRespBean;
 import com.mogo.och.taxi.bean.DriverStatusQueryRespBean;
@@ -309,7 +310,7 @@ public class TaxiModel {
 
                     @Override
                     public void onFail(int code, String msg) {
-                        ToastUtils.showShort(code + "," + msg);
+                        ToastUtilsOch.showWithCodeMessage(code,msg);
                         if(mCarStatusCallback!=null) {
                             mCarStatusCallback.onCarLoginStatusChange(StatusManager.isLogin());
                         }
@@ -344,7 +345,7 @@ public class TaxiModel {
 
                     @Override
                     public void onFail(int code, String msg) {
-                        ToastUtils.showShort(code + "," + msg);
+                        ToastUtilsOch.showWithCodeMessage(code, msg);
                     }
                 });
 
@@ -490,7 +491,7 @@ public class TaxiModel {
 
                     @Override
                     public void onFail(int code, String msg) {
-                        ToastUtils.showShort(code + "," + msg);
+                        ToastUtilsOch.showWithCodeMessage(code,msg);
                     }
                 });
     }
@@ -519,7 +520,7 @@ public class TaxiModel {
 
                     @Override
                     public void onFail(int code, String msg) {
-                        ToastUtils.showShort(code + "," + msg);
+                        ToastUtilsOch.showWithCodeMessage(code,msg);
                     }
                 });
     }
@@ -573,7 +574,7 @@ public class TaxiModel {
 
                     @Override
                     public void onFail(int code, String msg) {
-                        ToastUtils.showShort(code + "," + msg);
+                        ToastUtilsOch.showWithCodeMessage(code,msg);
                     }
                 });
     }
@@ -667,7 +668,7 @@ public class TaxiModel {
 
                     @Override
                     public void onFail(int code, String msg) {
-                        ToastUtils.showShort(code + "," + msg);
+                        ToastUtilsOch.showWithCodeMessage(code,msg);
                     }
                 });
     }
@@ -761,7 +762,7 @@ public class TaxiModel {
 
                     @Override
                     public void onFail(int code, String msg) {
-                        ToastUtils.showShort(code + "," + msg);
+                        ToastUtilsOch.showWithCodeMessage(code,msg);
                     }
                 });
     }
@@ -1578,7 +1579,6 @@ public class TaxiModel {
 
                     @Override
                     public void onError() {
-                        mCarStatusCallback.onCarLoginStatusChange(false);
                         if (!NetworkUtils.isConnected(mContext)) {
                             ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
                         } else {
@@ -1588,7 +1588,7 @@ public class TaxiModel {
 
                     @Override
                     public void onFail(int code, String msg) {
-                        ToastUtils.showShort(code + "," + msg);
+                        ToastUtilsOch.showWithCodeMessage(code,msg);
                     }
                 });
     }
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 a1ccc2ec62..e9cd5ce680 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
@@ -12,6 +12,7 @@ import androidx.appcompat.widget.AppCompatTextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
 import com.mogo.commons.mvp.MvpDialogFragment
@@ -203,7 +204,16 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, Taxi
      */
     override fun show(manager: FragmentManager, tag: String?) {
         try {
-            val cls = this.javaClass.superclass ?: return
+            var cls = this.javaClass.superclass ?: return
+            while (cls != null) {
+                if (cls.name == "java.lang.Object") {
+                    break
+                }
+                cls = cls.superclass!!
+                if (cls == DialogFragment::class.java) {
+                    break
+                }
+            }
             val mDismissed = cls.getDeclaredField("mDismissed")
             val mShownByMe = cls.getDeclaredField("mShownByMe")
             mDismissed.isAccessible = true