From 7ca1dc1595145a28de08b6a0b2c5f1a7d40331f8 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 8 Sep 2022 11:21:52 +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=E8=A2=AB=E9=94=80=E6=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/taxi/model/TaxiLoginModel.kt   | 7 +++++++
 .../com/mogo/och/taxi/presenter/TaxiLoginPresenter.kt     | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiLoginModel.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiLoginModel.kt
index be43294c32..bdef0b53fd 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiLoginModel.kt
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiLoginModel.kt
@@ -40,6 +40,13 @@ object TaxiLoginModel{
             .registerCarLocationChangedListener(TAG, mCarLocationChangedListener2)
     }
 
+    fun hasInit():Boolean{
+        if(mContext==null&& iTaxiLoginCallback==null){
+            return false;
+        }
+        return true
+    }
+
     // 自车定位
     private val mCarLocationChangedListener2 = IMogoCarLocationChangedListener2 { location ->
         mLongitude = location.longitude
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiLoginPresenter.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiLoginPresenter.kt
index fa5191bf3d..1497683ddc 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiLoginPresenter.kt
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiLoginPresenter.kt
@@ -29,15 +29,18 @@ class TaxiLoginPresenter(view: TaxiLoginDialogFragment?) :
     private var countDownDisposable: Disposable? = null
 
     init {
-        TaxiLoginModel.init(AbsMogoApplication.getApp())
         initListeners()
     }
 
     private fun initListeners() {
+        TaxiLoginModel.init(AbsMogoApplication.getApp())
         TaxiLoginModel.setiTaxiLoginCallback(this)
     }
 
     fun getPhoneCode(phone:String){
+        if(!TaxiLoginModel.hasInit()){
+            initListeners()
+        }
         if (!RegexUtils.isMobileExact(phone)) {
             ToastUtils.showShort(R.string.module_och_taxi_login_phone_error)
             mView?.inputPhoneError()
@@ -91,6 +94,9 @@ class TaxiLoginPresenter(view: TaxiLoginDialogFragment?) :
     }
 
     fun gotoLogin(phone: String, code: String) {
+        if(!TaxiLoginModel.hasInit()){
+            initListeners()
+        }
         if (!RegexUtils.isMobileExact(phone)) {
             ToastUtils.showShort(R.string.module_och_taxi_login_phone_error)
             mView?.inputPhoneError()