yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接口调试和部分页面

Browse Source
This commit is contained in:
yangyakun
2022-08-24 15:57:41 +08:00
parent 6ba43066e4
commit e2c580ac6a
10 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverStatusQueryRespBean.java
View File

@@ -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演示
}

1
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiLoginCallback.java
View File

@@ -14,4 +14,5 @@ import java.util.List;
*/
public interface ITaxiLoginCallback {
void getPhoneCodeSuccess();
void loginSuccess();
}

13
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiLoginModel.kt
View File

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

8
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
View File

@@ -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();
}
}

2
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java
View File

@@ -285,7 +285,7 @@ public class TaxiServiceManager {
*/
public void queryDriverServiceStatus(Context context,
TaxiServiceCallback<DriverStatusQueryRespBean> callback) {
mOCHTaxiServiceApi.queryDriverServiceStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
mOCHTaxiServiceApi.queryDriverServiceStatusAndLoginStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,MoGoAiCloudClientConfig.getInstance().getSn())
.subscribeOn(Schedulers.io())

4
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiLoginPresenter.kt
View File

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

11
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
View File

@@ -402,7 +402,16 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
if(taxiLoginDialogFragment==null||taxiLoginDialogFragment.get()==null) {
taxiLoginDialogFragment = new WeakReference<>(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 隐藏登录界面");

4
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt
View File

@@ -182,6 +182,10 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, Taxi
return keyCode == KeyEvent.KEYCODE_BACK
}
fun loginSuccess() {
dismissAllowingStateLoss()
}
companion object {
private val TAG = TaxiLoginDialogFragment::class.java.simpleName

16
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/StatusManager.kt
View File

@@ -28,6 +28,10 @@ object StatusManager {
}
}
@JvmStatic
fun setLoginStatus(loginStatus: TaxiLoginStatusEnum) {
this.loginStatus = loginStatus
}
@JvmStatic
fun getLoginStatus(): TaxiLoginStatusEnum {
return loginStatus
}
@@ -65,17 +69,5 @@ object StatusManager {
return openOrderStatus
}
@JvmStatic
fun changeOrderStatus() {
when (openOrderStatus) {
TaxiOpenOrderStatusEnum.Ordering -> {
openOrderStatus = TaxiOpenOrderStatusEnum.UnOrdering
}
TaxiOpenOrderStatusEnum.UnOrdering -> {
openOrderStatus = TaxiOpenOrderStatusEnum.Ordering
}
else -> {}
}
}
//endregion
}

1
OCH/mogo-och-taxi/src/main/res/values/strings.xml
View File

@@ -35,6 +35,7 @@
<string name="module_och_taxi_login_get_code">获取验证码</string>
<string name="module_och_taxi_login_get_code_title">请输入验证码</string>
<string name="module_och_taxi_login_get_code_success">获取验证码成功</string>
<string name="module_och_taxi_login_login_success">登录成功</string>
<string name="module_och_taxi_login_phone_error">请输入正确的手机号</string>
<string name="module_och_taxi_login_phone_hint_text">请输入手机号</string>
<string name="module_och_taxi_login_get_phone_title">请输入手机号</string>