From d7ff801372431e64aee8f68ece4b8532cffb2207 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 七月 2024 18:32:49 +0800
Subject: [PATCH] 2024年07月02日18:32:40
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 69 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index 870b1d7..cf95a31 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -30,6 +30,8 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
+import com.hdl.photovoltaic.listener.LinkCallBack;
+import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
@@ -47,6 +49,7 @@
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog1;
import com.hdl.photovoltaic.widget.ListDialog;
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
+import com.hdl.sdk.link.common.exception.HDLLinkException;
import java.util.List;
@@ -117,15 +120,14 @@
} else {
viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
}
-
- String acc = "18402017839";
+// String acc = "18402017839";
// String acc = "13375012441";
// String acc = "18316672920";
-// String acc = "nuy13368@uzxia.com";
- String pws = "123456";
+// String pws = "123456";
//娴嬭瘯鐢�
- viewBinding.homeLoginAccountEt.setText(acc);
- viewBinding.homeLoginPasswordEt.setText(pws);
+ viewBinding.homeLoginAccountEt.setText(UserConfigManage.getInstance().getAccount());
+// viewBinding.homeLoginPasswordEt.setText(pws);
+ checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
isLoginTextViewEnabled();
}
@@ -165,15 +167,18 @@
}
});
+ //杈撳叆璐﹀彿
viewBinding.homeLoginAccountEt.addTextChangedListener(accountTextWatcher);
+ //娓呴櫎璐﹀彿鎸夐挳
viewBinding.homeLoginClearContentsIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
viewBinding.homeLoginAccountEt.setText("");
}
});
-
+ //杈撳叆瀵嗙爜
viewBinding.homeLoginPasswordEt.addTextChangedListener(passwordTextWatcher);
+ //瀵嗙爜闅愯棌鎸夐挳
viewBinding.homeLoginHideIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -201,7 +206,7 @@
UserConfigManage.getInstance().setBAccount(v.isSelected());
viewBinding.homeLoginCheckBCIv.setSelected(UserConfigManage.getInstance().isBAccount());
if (UserConfigManage.getInstance().isBAccount()) {
- viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
+ viewBinding.homeLoginRegisterTv.setVisibility(View.INVISIBLE);
} else {
viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
}
@@ -370,6 +375,21 @@
}
/**
+ * 妫�娴嬫竻闄ゅ浘鏍囨槸鍚︽樉绀�
+ */
+ private void checkClearIconShowOrNot(String s) {
+ if (s.replace(" ", "").length() > 0) {
+ if (viewBinding.homeLoginClearContentsIv.getVisibility() == View.GONE) {
+ viewBinding.homeLoginClearContentsIv.setVisibility(View.VISIBLE);
+ }
+ } else {
+ if (viewBinding.homeLoginClearContentsIv.getVisibility() == View.VISIBLE) {
+ viewBinding.homeLoginClearContentsIv.setVisibility(View.GONE);
+ }
+ }
+ }
+
+ /**
* 鏈湴鏍￠獙杈撳叆璐﹀彿鎴栬�呭瘑鐮佹槸鍚︽纭�
*
* @param account 璐﹀彿
@@ -497,27 +517,28 @@
* 寮圭獥
*/
private void getDialog() {
- ConfirmationCancelDialog1 dialog = new ConfirmationCancelDialog1(_mActivity);
- dialog.show();
-// dialog.setTitle(getString(R.string.loading_privacy));
- dialog.isHideTitle(true);
- dialog.setContent(getString(R.string.loading_privacy_server));
- setStringDifferentColors(dialog.getContentTextView());
- dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+
+ ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
+ confirmationCancelDialog.show();
+ confirmationCancelDialog.isHideTitle(true);
+ confirmationCancelDialog.setContent(getString(R.string.loading_privacy_server));
+ setStringDifferentColors(confirmationCancelDialog.getContentTextView());
+ confirmationCancelDialog.setConfirmation(getString(R.string.loading_agree));
+ confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
+ confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
-
UserConfigManage.getInstance().setAcceiptPolicy(true);
viewBinding.homeLoginPrivacyCheckIv.setSelected(true);
- dialog.dismiss();
+ confirmationCancelDialog.dismiss();
}
});
- dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@Override
public void Cancel() {
UserConfigManage.getInstance().setAcceiptPolicy(false);
viewBinding.homeLoginPrivacyCheckIv.setSelected(false);
- dialog.dismiss();
+ confirmationCancelDialog.dismiss();
}
});
@@ -538,15 +559,7 @@
@Override
public void afterTextChanged(Editable s) {
- if (s.length() > 0) {
- if (viewBinding.homeLoginClearContentsIv.getVisibility() == View.GONE) {
- viewBinding.homeLoginClearContentsIv.setVisibility(View.VISIBLE);
- }
- } else {
- if (viewBinding.homeLoginClearContentsIv.getVisibility() == View.VISIBLE) {
- viewBinding.homeLoginClearContentsIv.setVisibility(View.GONE);
- }
- }
+ checkClearIconShowOrNot(s.toString());
isLoginTextViewEnabled();
}
};
--
Gitblit v1.8.0