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()