From 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:37 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java | 27 +++++++++++++++++++--------
1 files changed, 19 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 a7cdeab..a1d53b2 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,9 +38,10 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+
finish();
}
});
@@ -82,16 +83,26 @@
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.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