From e1577f14dc7ac4fe8b8df851e63ae7e3aebf72a7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 31 十月 2024 16:02:14 +0800
Subject: [PATCH] 2024年10月31日16:02:10

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 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 e08f03a..85d9a7e 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.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 
@@ -81,18 +81,27 @@
     }
 
     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.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_account_security);
+        viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
+        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
+        viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
+        viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
 
-        viewBinding.setAccountPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
-        viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setText(R.string.set_not_bind);
-        viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+        if (UserConfigManage.getInstance().isBAccount()) {
+            //浜戠鎺ュ彛涓嶆敮鎸�
+            viewBinding.setAccountPhoneIl.parentCl.setVisibility(View.GONE);
+            viewBinding.setAccountMailIl.parentCl.setVisibility(View.GONE);
+        } else {
+            viewBinding.setAccountPhoneIl.parentCl.setVisibility(View.VISIBLE);
+            viewBinding.setAccountMailIl.parentCl.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);
+            viewBinding.setAccountPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
+            viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+
+            viewBinding.setAccountMailIl.sllLlRlNameTv.setText(R.string.set_email_address);
+            viewBinding.setAccountMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+        }
+
         viewBinding.setChangePswIl.sllLlRlNameTv.setText(R.string.home_login_change_password);
         updateStyle();
 
@@ -103,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