From c660f059d4e07a1b784442a1bbb4a5109b82e837 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 25 六月 2024 09:51:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java | 26 ++++++++++++++++++--------
1 files changed, 18 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 e08f03a..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,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,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