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 |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 84d3a19..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
@@ -32,15 +32,17 @@
         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) {
                     @Override
                     public void onNext(@NonNull BaseResponse<String> response) {
                         if(200==response.getCode()){
+                            MApplication.setLoginBean(null);
                             MApplication.getLoginBean().setToken(response.getData());
-                            startActivity(ManageCabinetActivity.class);
+                            MApplication.getLoginBean().setAuthType(2);
+                            doAction(5);
                         }else {
                             doAction(4);
                         }

--
Gitblit v1.9.3