From cd16f8ff358d41af50307318aa4e420e1d608086 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 01 七月 2024 16:49:40 +0800
Subject: [PATCH] 2024年07月01日16:49:23

---
 app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 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 a480c51..90f3014 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;
 
@@ -165,15 +168,19 @@
             }
         });
 
+        //杈撳叆璐﹀彿
         viewBinding.homeLoginAccountEt.addTextChangedListener(accountTextWatcher);
+        //娓呴櫎璐﹀彿鎸夐挳
         viewBinding.homeLoginClearContentsIv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 viewBinding.homeLoginAccountEt.setText("");
+                viewBinding.homeLoginClearContentsIv.setVisibility(View.GONE);
             }
         });
-
+        //杈撳叆瀵嗙爜
         viewBinding.homeLoginPasswordEt.addTextChangedListener(passwordTextWatcher);
+        //瀵嗙爜闅愯棌鎸夐挳
         viewBinding.homeLoginHideIv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -201,7 +208,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);
                 }
@@ -497,27 +504,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();
             }
         });
 

--
Gitblit v1.8.0