From eb2f9a6c75b54371149de6ed8d1df023fbd40c56 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 9 Aug 2024 18:49:32 +0800 Subject: [PATCH] =?UTF-8?q?[6.6.0]=20[15666666666=206666=20=E7=A6=BB?= =?UTF-8?q?=E7=BA=BF=E8=B4=A6=E5=8F=B7=E5=AF=86=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/biz/login/LoginConst.kt | 44 +------------------ .../och/biz/login/presenter/LoginPresenter.kt | 5 +++ .../mogo/och/biz/login/ui/LoginFragment.kt | 11 ----- .../src/main/res/layout/biz_login_view.xml | 12 ----- 4 files changed, 7 insertions(+), 65 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginConst.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginConst.kt index f474a6ac36..e1110f91f3 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginConst.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginConst.kt @@ -7,49 +7,9 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig */ class LoginConst { companion object { - @JvmStatic - fun getBaseUrl(): String { - return FunctionBuildConfig.urlJson.ochUrl - } - @JvmStatic - fun getShuttleUrl(): String { - return FunctionBuildConfig.urlJson.shuttleUrl - } - @JvmStatic - fun getSweeperUrl(): String { - return FunctionBuildConfig.urlJson.sweeperUrl - } - @JvmStatic - fun getEagleMisUrl(): String { - return FunctionBuildConfig.urlJson.eagleMisUrl - } + const val OFFLINEPHONE = "15666666666" + const val OFFLINECODE = "6666" - // token 失效 重新获取token - const val WAIT_TAKEN = 100046 - - const val BIZ_LOGIN = "/ochbiz/common/login" - - const val BUS_DRIVER = "/bus/driver" - const val BUS_PASSENGER = "/bus/passenger" - - const val CHARTER_DRIVER = "/charter/driver" - const val CHARTER_PASSENGER = "/charter/passenger" - - const val SHUTTLE_DRIVER = "/shuttle/driver" - const val SHUTTLE_PASSENGER = "/shuttle/passenger" - - const val SWEEPER_DRIVER = "/sweeper/driver" - - const val TAXI_DRIVER = "/taxi/driver" - const val TAXI_PASSENGER = "/taxi/passenger" - - const val TAXI_UNMANNED_DRIVER = "/taxiunman/driver" - const val TAXI_UNMANNED_PASSENGER = "/taxiunman/passenger" - - const val BUSINESS_STRING = 100 - - // 自动驾驶自动规划的最大距离 - const val AUTOMATIC_PLANNING_MAX_DISTANCE = 15 } } \ No newline at end of file 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 8bc8461591..61ef3c31f6 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 @@ -8,6 +8,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.RegexUtils import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.biz.R +import com.mogo.och.biz.login.LoginConst import com.mogo.och.biz.login.callback.ITaxiLoginCallback import com.mogo.och.biz.login.ui.LoginFragment import com.mogo.och.biz.login.model.LoginModel @@ -107,6 +108,10 @@ class LoginPresenter(view: LoginFragment?) : Presenter(view), IT ToastCharterUtils.showToastShort(R.string.module_och_taxi_login_code_error) return } + if(phone== LoginConst.OFFLINEPHONE&&code==LoginConst.OFFLINECODE){ + gotoOfflineMode() + return + } LoginModel.queryCarStatus() mView?.closeSoftInput() this.phone = 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 d42689f0eb..c92d97f6f0 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 @@ -20,22 +20,14 @@ 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.biz.login.BusinessEnum -import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType -import com.mogo.och.common.module.manager.socket.lan.bean.EnvType -import com.mogo.och.common.module.manager.socket.lan.bean.ProjectType -import com.mogo.och.common.module.manager.socket.lan.bean.VehicleType -import com.mogo.och.common.module.utils.RxUtils import kotlinx.android.synthetic.main.biz_login_view.biz_acbtn_login import kotlinx.android.synthetic.main.biz_login_view.biz_ace_login_phone_value import kotlinx.android.synthetic.main.biz_login_view.biz_acet_phone_code_value import kotlinx.android.synthetic.main.biz_login_view.biz_actv_login_get_code import kotlinx.android.synthetic.main.biz_login_view.biz_actv_login_show_sn import kotlinx.android.synthetic.main.biz_login_view.biz_actv_welcome_login_title -import kotlinx.android.synthetic.main.biz_login_view.biz_cl_driver_main import kotlinx.android.synthetic.main.biz_login_view.bv_switch_business import kotlinx.android.synthetic.main.biz_login_view.eiv_Info -import kotlinx.android.synthetic.main.biz_login_view.iv_login_offline /** @@ -110,9 +102,6 @@ class LoginFragment : MvpFragment(), ILoginView biz_actv_login_get_code.onClick { mPresenter?.getPhoneCode(biz_ace_login_phone_value.text.toString()) } - iv_login_offline.setOnClickListener { - mPresenter?.gotoOfflineMode() - } biz_ace_login_phone_value.addTextChangedListener { it?.let { itEditable -> 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 c5dada8359..4c91e037cc 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 @@ -159,16 +159,4 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> - - - \ No newline at end of file