From 656cfcad28f51d0a03e5269c7f1c9f24d727d4c8 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 29 Nov 2024 15:32:00 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.0]=20[fix]=20[=E8=8E=B7=E5=8F=96=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/biz/login/model/LoginModel.kt | 49 ++++++++++--------- .../och/biz/login/presenter/LoginPresenter.kt | 2 + .../mogo/och/biz/login/ui/LoginFragment.kt | 9 +++- .../biz_login_getcode_text_color_selector.xml | 6 +++ .../src/main/res/layout/biz_login_view.xml | 3 +- OCH/common/biz/src/main/res/values/colors.xml | 2 + .../com/mogo/och/weaknet/model/OrderModel.kt | 18 ++++--- 7 files changed, 57 insertions(+), 32 deletions(-) create mode 100644 OCH/common/biz/src/main/res/color/biz_login_getcode_text_color_selector.xml diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt index 5523af518f..1b3b4001ce 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt @@ -31,6 +31,7 @@ import com.mogo.och.common.module.biz.login.LoginStatusEnum.Companion.valueOf import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager import com.mogo.och.common.module.manager.cache.OchSPManager +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.socket.lan.bean.BusCacheKey import com.mogo.och.common.module.manager.socket.lan.bean.LoginCacheStatus import com.mogo.och.common.module.network.OchCommonServiceCallback @@ -101,33 +102,37 @@ object LoginModel { * 获取手机验证码 */ fun getPhoneCode(phone: String?) { - mContext?.let { - OchCommonServiceManager.getPhoneCode(it, phone, - object : OchCommonServiceCallback { - override fun onSuccess(data: BaseData?) { - if (null != data && 0 == data.code) { - // 获取验证码成功 - ToastCharterUtils.showToastShort(mContext?.getString(R.string.module_och_taxi_login_get_code_success)) - iTaxiLoginCallback?.getPhoneCodeSuccess() - } else { - if (data != null) { - ToastCharterUtils.showToastShort(data.code.toString()) + if(mContext==null){ + OchChainLogManager.writeChainLog("登录页面","获取验证码 mContext${mContext}") + }else { + mContext?.let { + OchCommonServiceManager.getPhoneCode(it, phone, + object : OchCommonServiceCallback { + override fun onSuccess(data: BaseData?) { + if (null != data && 0 == data.code) { + // 获取验证码成功 + ToastCharterUtils.showToastShort(mContext?.getString(R.string.module_och_taxi_login_get_code_success)) + iTaxiLoginCallback?.getPhoneCodeSuccess() + } else { + if (data != null) { + ToastCharterUtils.showToastShort(data.code.toString()) + } } } - } - override fun onError() { - if (!NetworkUtils.isConnected(mContext)) { - ToastCharterUtils.showToastShort(mContext?.getString(R.string.network_error_tip)) - } else { - ToastCharterUtils.showToastShort(mContext?.getString(R.string.request_error_tip)) + override fun onError() { + if (!NetworkUtils.isConnected(mContext)) { + ToastCharterUtils.showToastShort(mContext?.getString(R.string.network_error_tip)) + } else { + ToastCharterUtils.showToastShort(mContext?.getString(R.string.request_error_tip)) + } } - } - override fun onFail(code: Int, msg: String) { - ToastUtilsOch.showWithCodeMessage(code, msg) - } - }) + override fun onFail(code: Int, msg: String) { + ToastUtilsOch.showWithCodeMessage(code, msg) + } + }) + } } } diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPresenter.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPresenter.kt index ed54218c96..ba519c5bfb 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPresenter.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPresenter.kt @@ -13,6 +13,7 @@ import com.mogo.och.biz.login.callback.ITaxiLoginCallback import com.mogo.och.biz.login.ui.LoginFragment import com.mogo.och.biz.login.model.LoginModel import com.mogo.och.common.module.biz.login.LoginStatusManager +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -54,6 +55,7 @@ class LoginPresenter(view: LoginFragment?) : Presenter(view), IT if (!RegexUtils.isMobileExact(phone)) { ToastCharterUtils.showToastShort(R.string.module_och_taxi_login_phone_error) mView?.inputPhoneError() + OchChainLogManager.writeChainLog("登录页面","获取验证码 手机号输入错误") return } LoginModel.getPhoneCode(phone) 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 13dac4b9da..d8617b482e 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 @@ -32,6 +32,7 @@ import com.mogo.och.biz.BuildConfig import com.mogo.och.biz.R import com.mogo.och.biz.login.callback.ILoginViewCallback import com.mogo.och.biz.login.presenter.LoginPresenter +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.skin.utils.SkinResources import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack @@ -134,8 +135,12 @@ class LoginFragment : MvpFragment(), ILoginView biz_actv_welcome_login_title.setOnClickListener { continuousClick() } - biz_actv_login_get_code.onClick(300) { - mPresenter?.getPhoneCode(biz_ace_login_phone_value.text.toString()) + biz_actv_login_get_code.setOnClickListener { + if(mPresenter==null){ + OchChainLogManager.writeChainLog("司机登录页面","mPresenter=${mPresenter}") + }else{ + mPresenter?.getPhoneCode(biz_ace_login_phone_value.text.toString()) + } } biz_ace_login_phone_value.addTextChangedListener { diff --git a/OCH/common/biz/src/main/res/color/biz_login_getcode_text_color_selector.xml b/OCH/common/biz/src/main/res/color/biz_login_getcode_text_color_selector.xml new file mode 100644 index 0000000000..c43b688766 --- /dev/null +++ b/OCH/common/biz/src/main/res/color/biz_login_getcode_text_color_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/common/biz/src/main/res/layout/biz_login_view.xml b/OCH/common/biz/src/main/res/layout/biz_login_view.xml index 0c7eab0652..5a1c9133a2 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_view.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_view.xml @@ -128,7 +128,8 @@ app:layout_constraintEnd_toEndOf="@+id/v_phone_code_bg" android:paddingEnd="30dp" android:textSize="40dp" - android:textColor="@color/biz_login_878890" + app:pressed_enabled="false" + android:textColor="@color/biz_login_getcode_text_color_selector" android:gravity="start|center_vertical" android:text="@string/module_och_taxi_login_get_code" android:layout_width="wrap_content" diff --git a/OCH/common/biz/src/main/res/values/colors.xml b/OCH/common/biz/src/main/res/values/colors.xml index 23eef2ad05..7db2562862 100644 --- a/OCH/common/biz/src/main/res/values/colors.xml +++ b/OCH/common/biz/src/main/res/values/colors.xml @@ -12,4 +12,6 @@ #19FFF5 #1970FF + #2EACFF + \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt index c04163792f..d21e4be28e 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt @@ -510,13 +510,17 @@ object OrderModel { @JvmStatic fun logoutInner() { ThreadUtils.getIoPool().execute { - if(RepositoryManager.haveDataWaitSyn()){ - ToastUtils.showShort(ResourcesUtils.getString(R.string.shuttle_logout_error)) - return@execute - } - if(RepositoryManager.haveRunningTask()){ - ToastUtils.showShort(ResourcesUtils.getString(R.string.shuttle_logout_error_running)) - return@execute + try { + if(RepositoryManager.haveDataWaitSyn()){ + ToastUtils.showShort(ResourcesUtils.getString(R.string.shuttle_logout_error)) + return@execute + } + if(RepositoryManager.haveRunningTask()){ + ToastUtils.showShort(ResourcesUtils.getString(R.string.shuttle_logout_error_running)) + return@execute + } + }catch (e:Exception){ + OchChainLogManager.writeChainLog("错误","${e.message}") } MapMakerManager.removeAllMapMarkerByOwner(TAG) BusTrajectoryManager.getInstance().stopTrajReqLoop();