From 35a1531419c71b831cff6092ad4cb5ed6ca168c2 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 21 Oct 2024 15:28:53 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fix]=20[=E6=B7=BB=E5=8A=A0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/biz/login/LoginProvider.kt | 8 ++++++--
 .../main/java/com/mogo/och/biz/login/ui/LoginFragment.kt  | 4 ++--
 .../com/mogo/och/biz/login/ui/LoginPassengerFragment.kt   | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt
index dfb9392426..7ea43aa64b 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt
@@ -139,7 +139,9 @@ class LoginProvider : LoginService {
                 changeStatus(checkAllEnv)
                 UiThreadHandler.post({
                     changeStatus(checkAllEnv)
-                    (loginFragment as ILoginViewCallback).checkAllEnv(checkAllEnv)
+                    if (loginFragment!!.isAdded) {
+                        (loginFragment as ILoginViewCallback).checkAllEnv(checkAllEnv)
+                    }
                 },UiThreadHandler.MODE.QUEUE)
             }
         }
@@ -148,7 +150,9 @@ class LoginProvider : LoginService {
     }
 
     override fun changeStatus(currentStatus: String) {
-        (loginFragment as ILoginViewCallback).updateStatus(currentStatus)
+        if (loginFragment!!.isAdded) {
+            (loginFragment as ILoginViewCallback).updateStatus(currentStatus)
+        }
     }
 
 
diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt
index 7025d727f5..122ec46324 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt
@@ -303,8 +303,8 @@ class LoginFragment : MvpFragment<LoginFragment?, LoginPresenter?>(), ILoginView
 
     override fun showErrorInfo(errorInfo: String) {
         ToastUtils.showLong(errorInfo)
-        eiv_Info.visibility = View.VISIBLE
-        eiv_Info.showErrinfo(errorInfo)
+        eiv_Info?.visibility = View.VISIBLE
+        eiv_Info?.showErrinfo(errorInfo)
     }
 
     override fun checkAllEnv(
diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
index 8dbda19ab5..d008108b09 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
@@ -98,12 +98,12 @@ class LoginPassengerFragment : MvpFragment<LoginPassengerFragment?, LoginPasseng
     override fun checkAllEnv(
         reason:String
     ) {
-        eiv_Info.visibility = View.VISIBLE
-        eiv_Info.showErrinfo(reason)
+        eiv_Info?.visibility = View.VISIBLE
+        eiv_Info?.showErrinfo(reason)
     }
 
     override fun updateStatus(status: String) {
-        statusList.add(status)
+        statusList?.add(status)
     }
 
     override fun onResume() {