From 788c70114287306db20e9a4539018d6e32fb5cb7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 19 四月 2024 10:10:10 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 a7cdeab..158dc05 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
@@ -41,6 +41,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+
finish();
}
});
@@ -85,13 +86,23 @@
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, 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.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);
+ }
+
viewBinding.setChangePswIl.sllLlRlNameTv.setText(R.string.home_login_change_password);
updateStyle();
--
Gitblit v1.8.0