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/ManageLoginActivity.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginActivity.java
index 288c1f4..96baac9 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginActivity.java
@@ -33,7 +33,8 @@
 
     @Override
     public void initView(@Nullable Bundle savedInstanceState) {
-        isAddCountTimer = false;
+        downTime = 30;
+        isAddCountTimer = true;
         normalConfig();
         getDB().setModel(getVM());
     }
@@ -66,9 +67,7 @@
                 getVM().loginCabinet(getDB().etName.getText().toString(),getDB().etPw.getText().toString());
                 break;
             case 3:
-                //鏄剧ず鍔犺浇
-                getDB().clProgress.setVisibility(View.VISIBLE);
-                getDB().clTip.setVisibility(View.GONE);
+                finish();
                 break;
             case 4:
                 getDB().clProgress.setVisibility(View.GONE);
@@ -79,6 +78,11 @@
             case 5:
                 startActivity(ManageCabinetActivity.class);
                 finish();
+                break;
+            case 6:
+                //鏄剧ず鍔犺浇
+                getDB().clProgress.setVisibility(View.VISIBLE);
+                getDB().clTip.setVisibility(View.GONE);
                 break;
             default:
                 break;
@@ -112,4 +116,9 @@
             }
         }
     }
+
+    @Override
+    protected void timeChange(String djs) {
+        getDB().tvDjs.setText(djs);
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3