From e57e1c01a52a326343122d458ad3bd330fc9d347 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 07 二月 2025 16:40:29 +0800
Subject: [PATCH] Merge branch '1.5.1'

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
index b17834e..7b0f20b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
@@ -28,7 +28,7 @@
 
     @Override
     public void onBindView(Bundle savedInstanceState) {
-       setStatusBarTranslucent();
+        setStatusBarTranslucent();
         getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
         //鍒濆鍖�
         initView();
@@ -70,10 +70,10 @@
             }
         });
 
-        viewBinding.setAccountClose.setOnClickListener(new View.OnClickListener() {
+        viewBinding.setAccountCloseIl.getRoot().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                startActivity(UnregisterActivity.class);
             }
         });
 
@@ -88,6 +88,7 @@
             //浜戠鎺ュ彛涓嶆敮鎸�
             viewBinding.setAccountPhoneIl.parentCl.setVisibility(View.GONE);
             viewBinding.setAccountMailIl.parentCl.setVisibility(View.GONE);
+            viewBinding.setAccountCloseIl.parentCl.setVisibility(View.GONE);
         } else {
             viewBinding.setAccountPhoneIl.parentCl.setVisibility(View.VISIBLE);
             viewBinding.setAccountMailIl.parentCl.setVisibility(View.VISIBLE);
@@ -98,6 +99,9 @@
 
             viewBinding.setAccountMailIl.sllLlRlNameTv.setText(R.string.set_email_address);
             viewBinding.setAccountMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+
+            viewBinding.setAccountCloseIl.sllLlRlNameTv.setText(R.string.set_close_account);
+            viewBinding.setAccountCloseIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
         }
 
         viewBinding.setChangePswIl.sllLlRlNameTv.setText(R.string.home_login_change_password);

--
Gitblit v1.8.0