From 0cc81c61f36d0072b6252737e3d106ba0d4518a3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 31 十月 2025 10:10:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginVM.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginVM.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginVM.java
index 89e58c7..6ed3624 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginVM.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginVM.java
@@ -29,14 +29,10 @@
}
public void loginCabinet(String userName,String pw){
- if(true){
- doAction(5);
- return;
- }
LoginCabinetParam param = new LoginCabinetParam();
param.setUsername(userName);
param.setPassword(pw);
- doAction(3);
+ doAction(6);
getRetrofitService(Apis.class).loginCabinet(ParamsUtil.encodeRequestBody(param))
.compose(RxUtils.schedulersTransformer())
.subscribe(new SimpleObserver<BaseResponse<String>>(rxJavaGcManager) {
@@ -45,6 +41,7 @@
if(200==response.getCode()){
MApplication.setLoginBean(null);
MApplication.getLoginBean().setToken(response.getData());
+ MApplication.getLoginBean().setAuthType(2);
doAction(5);
}else {
doAction(4);
--
Gitblit v1.9.3