From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 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 e2b8729..b17834e 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,8 +28,8 @@
 
     @Override
     public void onBindView(Bundle savedInstanceState) {
-        setNotificationBarBackgroundColor(CustomColor.white);
-        setStatusBarTextColor();
+       setStatusBarTranslucent();
+        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
         //鍒濆鍖�
         initView();
         //鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -38,7 +38,7 @@
 
     private void initEvent() {
 
-        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+        viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 
@@ -81,11 +81,8 @@
     }
 
     private void initView() {
-        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_account_security);
-        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
-        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
-        viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
-        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_account_security);
+        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
 
         if (UserConfigManage.getInstance().isBAccount()) {
             //浜戠鎺ュ彛涓嶆敮鎸�
@@ -97,6 +94,7 @@
 
             viewBinding.setAccountPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
             viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+            viewBinding.setAccountPhoneIl.lineV.setVisibility(View.VISIBLE);
 
             viewBinding.setAccountMailIl.sllLlRlNameTv.setText(R.string.set_email_address);
             viewBinding.setAccountMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);

--
Gitblit v1.8.0