From 30859ca8f2175475d2c666353bc27f3b2ceede53 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 22 八月 2024 13:43:47 +0800
Subject: [PATCH] 2024年08月22日13:43:45

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 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 158dc05..e2b8729 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
@@ -38,7 +38,7 @@
 
     private void initEvent() {
 
-        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 
@@ -83,7 +83,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.topBackBtn.setVisibility(View.VISIBLE);
+        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));
 
         if (UserConfigManage.getInstance().isBAccount()) {
@@ -95,11 +96,9 @@
             viewBinding.setAccountMailIl.parentCl.setVisibility(View.VISIBLE);
 
             viewBinding.setAccountPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
-            viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setText(R.string.set_not_bind);
             viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
 
             viewBinding.setAccountMailIl.sllLlRlNameTv.setText(R.string.set_email_address);
-            viewBinding.setAccountMailIl.sllLlRlRightContentTv.setText(R.string.set_not_bind);
             viewBinding.setAccountMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
         }
 
@@ -113,12 +112,10 @@
      * 鍒锋柊缁戝畾鎵嬫満鍙峰拰閭
      */
     private void updateStyle() {
-        if (!TextUtils.isEmpty(UserConfigManage.getInstance().getBingPhone())) {
-            viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getBingPhone());
-        }
-        if (!TextUtils.isEmpty(UserConfigManage.getInstance().getBingEmail())) {
-            viewBinding.setAccountMailIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getBingEmail());
-        }
+        String phoneStr = TextUtils.isEmpty(UserConfigManage.getInstance().getBingPhone()) ? getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingPhone();
+        String emailStr = TextUtils.isEmpty(UserConfigManage.getInstance().getBingEmail()) ? getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingEmail();
+        viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setText(phoneStr);
+        viewBinding.setAccountMailIl.sllLlRlRightContentTv.setText(emailStr);
     }
 
     @Override

--
Gitblit v1.8.0