From 0ccb78cfb85fbba31ee16a57b13752747585b9a9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:15:12 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java | 33 ++++++++++++++++-----------------
1 files changed, 16 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 158dc05..7b0f20b 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
@@ -28,8 +28,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -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) {
@@ -70,10 +70,10 @@
}
});
- viewBinding.setAccountClose.setOnClickListener(new View.OnClickListener() {
+ viewBinding.setAccountCloseIl.getRoot().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-
+ startActivity(UnregisterActivity.class);
}
});
@@ -81,26 +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.topBackLl.setVisibility(View.VISIBLE);
if (UserConfigManage.getInstance().isBAccount()) {
//浜戠鎺ュ彛涓嶆敮鎸�
viewBinding.setAccountPhoneIl.parentCl.setVisibility(View.GONE);
viewBinding.setAccountMailIl.parentCl.setVisibility(View.GONE);
+ viewBinding.setAccountCloseIl.parentCl.setVisibility(View.GONE);
} else {
viewBinding.setAccountPhoneIl.parentCl.setVisibility(View.VISIBLE);
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.setAccountPhoneIl.lineV.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.setAccountCloseIl.sllLlRlNameTv.setText(R.string.set_close_account);
+ viewBinding.setAccountCloseIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
}
viewBinding.setChangePswIl.sllLlRlNameTv.setText(R.string.home_login_change_password);
@@ -113,12 +114,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