From e2c580ac6a05d2cfc934e4d619fe714b081931ad Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 24 Aug 2022 15:57:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95=E5=92=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/bean/DriverStatusQueryRespBean.java | 4 ++-- .../och/taxi/callback/ITaxiLoginCallback.java | 1 + .../com/mogo/och/taxi/model/TaxiLoginModel.kt | 13 ++++++------- .../java/com/mogo/och/taxi/model/TaxiModel.java | 8 ++++---- .../och/taxi/network/TaxiServiceManager.java | 2 +- .../och/taxi/presenter/TaxiLoginPresenter.kt | 4 ++++ .../java/com/mogo/och/taxi/ui/TaxiFragment.java | 11 ++++++++++- .../mogo/och/taxi/ui/TaxiLoginDialogFragment.kt | 4 ++++ .../com/mogo/och/taxi/utils/StatusManager.kt | 16 ++++------------ .../src/main/res/values/strings.xml | 1 + 10 files changed, 37 insertions(+), 27 deletions(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverStatusQueryRespBean.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverStatusQueryRespBean.java index 46bc6e0fcc..bb65c2efc8 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverStatusQueryRespBean.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverStatusQueryRespBean.java @@ -11,8 +11,8 @@ public class DriverStatusQueryRespBean extends BaseData { public Result data; public static class Result { - public int serviceStatus; //0收车，1出车 - public int loginStatus; //0收车，1出车 + public int servingStatus; //0收车，1出车 + public int driverStatus; //0收车，1出车 public String orderNo; public int purpose; // 1 运营, 2 测试, 3演示 } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiLoginCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiLoginCallback.java index c320810e88..a8f35171cb 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiLoginCallback.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiLoginCallback.java @@ -14,4 +14,5 @@ import java.util.List; */ public interface ITaxiLoginCallback { void getPhoneCodeSuccess(); + void loginSuccess(); } 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 e5bee4de53..2f830b5383 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 @@ -14,6 +14,8 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.taxi.R import com.mogo.och.taxi.bean.TaxiLoginReqBean import com.mogo.och.taxi.bean.TaxiLoginRespBean +import com.mogo.och.taxi.constant.TaxiLoginStatusEnum +import com.mogo.och.taxi.utils.StatusManager /** * Created by pangfan on 2021/8/19 @@ -70,9 +72,7 @@ object TaxiLoginModel{ if (null != data && 0 == data.code) { // 获取验证码成功 ToastUtils.showShort(mContext!!.getString(R.string.module_och_taxi_login_get_code_success)) - if (iTaxiLoginCallback != null) { - iTaxiLoginCallback!!.getPhoneCodeSuccess() - } + iTaxiLoginCallback?.getPhoneCodeSuccess() } else { if (data != null) { ToastUtils.showShort(data.code) @@ -101,10 +101,9 @@ object TaxiLoginModel{ override fun onSuccess(data: TaxiLoginRespBean?) { if (null != data && 0 == data.code) { // 获取验证码成功 - ToastUtils.showShort(mContext!!.getString(R.string.module_och_taxi_login_get_code_success)) - if (iTaxiLoginCallback != null) { - iTaxiLoginCallback!!.getPhoneCodeSuccess() - } + ToastUtils.showShort(mContext!!.getString(R.string.module_och_taxi_login_login_success)) + StatusManager.setLoginStatus(TaxiLoginStatusEnum.Login) + iTaxiLoginCallback?.loginSuccess() } else { if (data != null) { ToastUtils.showShort(data.code) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 13d3fdf568..4bcaaa4079 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -271,8 +271,8 @@ public class TaxiModel { @Override public void onSuccess(DriverStatusQueryRespBean data) { if (null != data && 0 == data.code) { - StatusManager.setLoginStatus(data.data.loginStatus); - StatusManager.setOpenOrderStatus(data.data.serviceStatus); + StatusManager.setLoginStatus(data.data.driverStatus); + StatusManager.setOpenOrderStatus(data.data.servingStatus); //更新view CallerLogger.INSTANCE.d(M_TAXI + TAG, "changeCarStatus:" + StatusManager.getLoginStatus()); startOrStopOrderLoop(StatusManager.isLogin()); @@ -284,7 +284,7 @@ public class TaxiModel { role = TaxiConst.TEST_USER; } if (mCarStatusCallback != null) { - mCarStatusCallback.onCarStatusChanged(StatusManager.isLogin(), role); + mCarStatusCallback.onCarStatusChanged(StatusManager.isOpeningOrderStatus(), role); } } @@ -319,7 +319,7 @@ public class TaxiModel { @Override public void onSuccess(BaseData data) { if (null != data && 0 == data.code) { - StatusManager.changeOrderStatus(); + //StatusManager.changeOrderStatus(); queryCarStatus(); } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java index f113d752df..4e2750299a 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java @@ -285,7 +285,7 @@ public class TaxiServiceManager { */ public void queryDriverServiceStatus(Context context, TaxiServiceCallback callback) { - mOCHTaxiServiceApi.queryDriverServiceStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() + mOCHTaxiServiceApi.queryDriverServiceStatusAndLoginStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) .subscribeOn(Schedulers.io()) 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 f240c72db3..a44dc70275 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 @@ -86,6 +86,10 @@ class TaxiLoginPresenter(view: TaxiLoginDialogFragment?) : }) } + override fun loginSuccess() { + mView?.loginSuccess() + } + fun gotoLogin(phone: String, code: String) { if (!RegexUtils.isMobileExact(phone)) { ToastUtils.showShort(R.string.module_och_taxi_login_phone_error) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java index 0e751d49f2..6e001b7d91 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java @@ -402,7 +402,16 @@ public class TaxiFragment extends BaseTaxiTabFragment(TaxiLoginDialogFragment.newInstance()); } - taxiLoginDialogFragment.get().show(getParentFragmentManager(),taxiLoginDialogFragment.get().getTag()); + TaxiLoginDialogFragment taxiLoginDialog = taxiLoginDialogFragment.get(); + if(taxiLoginDialog!=null) { + if (taxiLoginDialog.getDialog() != null && taxiLoginDialog.getDialog().isShowing()) { + return; + } + if (taxiLoginDialog.isAdded()) {//解决方法就是添加这行代码，如果已经添加了，就移除掉然后再show，就不会出现Fragment already added的错误了。 + getParentFragmentManager().beginTransaction().remove(taxiLoginDialog).commit(); + } + taxiLoginDialog.show(getParentFragmentManager(), taxiLoginDialog.getTag()); + } } public void hideLoginDialogFragment(){ CallerLogger.INSTANCE.d(M_TAXI + TAG,"hideLoginDialogFragment 隐藏登录界面"); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt index 4106b63711..c71d37594e 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt @@ -182,6 +182,10 @@ class TaxiLoginDialogFragment : MvpDialogFragment { - openOrderStatus = TaxiOpenOrderStatusEnum.UnOrdering - } - TaxiOpenOrderStatusEnum.UnOrdering -> { - openOrderStatus = TaxiOpenOrderStatusEnum.Ordering - } - else -> {} - } - } //endregion } \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/values/strings.xml b/OCH/mogo-och-taxi/src/main/res/values/strings.xml index 5cd6eac3f7..7defd4e933 100644 --- a/OCH/mogo-och-taxi/src/main/res/values/strings.xml +++ b/OCH/mogo-och-taxi/src/main/res/values/strings.xml @@ -35,6 +35,7 @@ 获取验证码 请输入验证码 获取验证码成功 + 登录成功 请输入正确的手机号 请输入手机号 请输入手机号