From 6c7f4753558099fb19919db8a3663c88d2a06e40 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 七月 2024 13:41:50 +0800
Subject: [PATCH] 2024年07月02日13:41:45

---
 app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 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 90f3014..fd20c2d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -122,13 +122,14 @@
         }
 
 //        String acc = "18402017839";
-        String acc = "13375012441";
+//        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(acc);
+//        viewBinding.homeLoginPasswordEt.setText(pws);
+        checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
         isLoginTextViewEnabled();
     }
 
@@ -174,9 +175,7 @@
         viewBinding.homeLoginClearContentsIv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                viewBinding.homeLoginAccountEt.setText("");
-                viewBinding.homeLoginClearContentsIv.setVisibility(View.GONE);
-            }
+                viewBinding.homeLoginAccountEt.setText("");}
         });
         //杈撳叆瀵嗙爜
         viewBinding.homeLoginPasswordEt.addTextChangedListener(passwordTextWatcher);
@@ -377,6 +376,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  璐﹀彿
@@ -546,15 +560,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