From 22881a4d6409c7d17867e1d40bf81a13578208df Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 31 十月 2025 15:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginActivity.java | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 73 insertions(+), 6 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 608e910..2a1ffe1 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
@@ -5,13 +5,22 @@
import android.os.Bundle;
import android.text.TextUtils;
+import android.text.method.HideReturnsTransformationMethod;
+import android.text.method.PasswordTransformationMethod;
import android.view.View;
import android.widget.Toast;
+import com.doumee.keyCabinet.BuildConfig;
+import com.doumee.keyCabinet.MApplication;
import com.doumee.keyCabinet.R;
import com.doumee.keyCabinet.base.MyBaseActivity;
import com.doumee.keyCabinet.databinding.ManageLoginActivityBinding;
+import com.doumee.keyCabinet.event.TimeClockEvent;
+import com.doumee.keyCabinet.utils.LMobileInfo;
import com.doumee.lib_coremodel.bean.event.ActionEventData;
+import com.innohi.YNHAPI;
+
+import org.greenrobot.eventbus.Subscribe;
import dagger.hilt.android.AndroidEntryPoint;
@@ -26,14 +35,29 @@
@Override
public void initView(@Nullable Bundle savedInstanceState) {
- isAddCountTimer = false;
+ downTime = 30;
+ isAddCountTimer = true;
normalConfig();
getDB().setModel(getVM());
}
@Override
public void initData(@Nullable Bundle savedInstanceState) {
+ getDB().tvNo.setText("NO锛�"+ LMobileInfo.getDeviceUniqueId());
+ getDB().tvV.setText("V"+ BuildConfig.VERSION_NAME);
+ getDB().tv1.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View v) {
+ if(MApplication.getConfigBean().getId()==null){
+ //鍙互涓嬫媺
+ YNHAPI mAPI = YNHAPI.getInstance();
+ mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.VISIBLE);
+ return true;
+ }
+ return false;
+ }
+ });
}
@Override
@@ -41,7 +65,8 @@
switch (type){
case 1:
//鏄剧ず瀵嗙爜
-
+ isShowPw = !isShowPw;
+ updatePassword();
break;
case 2:
if(TextUtils.isEmpty(getDB().etName.getText().toString())){
@@ -55,16 +80,58 @@
getVM().loginCabinet(getDB().etName.getText().toString(),getDB().etPw.getText().toString());
break;
case 3:
+ finish();
+ break;
+ case 4:
+ getDB().clProgress.setVisibility(View.GONE);
+ tipDownCount = 60;
+ isShowTip = true;
+ getDB().clTip.setVisibility(View.VISIBLE);
+ break;
+ case 5:
+ startActivity(ManageCabinetActivity.class);
+ finish();
+ break;
+ case 6:
//鏄剧ず鍔犺浇
getDB().clProgress.setVisibility(View.VISIBLE);
getDB().clTip.setVisibility(View.GONE);
break;
- case 4:
- getDB().clProgress.setVisibility(View.GONE);
- getDB().clTip.setVisibility(View.VISIBLE);
- break;
default:
break;
}
}
+
+ private boolean isShowPw = false;
+ private void updatePassword() {
+ if(isShowPw){
+ getDB().img3.setImageResource(R.mipmap.login_eyeopen);
+ // 鏄剧ず瀵嗙爜
+ getDB().etPw.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
+ }else {
+ getDB().img3.setImageResource(R.mipmap.login_eyeclose);
+ // 闅愯棌瀵嗙爜
+ getDB().etPw.setTransformationMethod(PasswordTransformationMethod.getInstance());
+ }
+ }
+
+ private int tipDownCount = 60;
+ private boolean isShowTip;
+ @Subscribe
+ public void TimeClockEvent(TimeClockEvent e){
+ if(isShowTip){
+ if(tipDownCount==0){
+ isShowTip = false;
+ finish();
+ }else {
+ tipDownCount--;
+ getDB().tvClKmClose.setText(tipDownCount+"s 鑷姩鍏抽棴");
+ }
+ }
+ }
+
+ @Override
+ protected void timeChange(String djs) {
+ getDB().tvDjs.setText(djs);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3