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 |   37 +++++++++++++++++++++----------------
 1 files changed, 21 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..cf95a31 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -120,15 +120,14 @@
         } else {
             viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
         }
-
 //        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(UserConfigManage.getInstance().getAccount());
+//        viewBinding.homeLoginPasswordEt.setText(pws);
+        checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
         isLoginTextViewEnabled();
     }
 
@@ -175,7 +174,6 @@
             @Override
             public void onClick(View v) {
                 viewBinding.homeLoginAccountEt.setText("");
-                viewBinding.homeLoginClearContentsIv.setVisibility(View.GONE);
             }
         });
         //杈撳叆瀵嗙爜
@@ -377,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  璐﹀彿
@@ -546,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