From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
index 43fde85..27842ba 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
@@ -27,8 +27,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomBaseActivity.CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -44,7 +44,7 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentMeRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// backPressedData();
@@ -65,11 +65,8 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me_personal_data);
- viewBinding.toolbarTopFragmentMeRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentMeRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentMeRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentMeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.me_personal_data);
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
viewBinding.personalDataUserPortraitIl.sllLlRlNameTv.setText(R.string.me_personal_data_portrait);
viewBinding.personalDataUserNameIl.sllLlRlNameTv.setText(R.string.me_personal_data_user_name);
@@ -79,24 +76,25 @@
viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
viewBinding.personalDataUserPortraitIl.sllLlRlRightNextIv.setVisibility(View.GONE);
+ viewBinding.personalDataUserPortraitIl.lineV.setVisibility(View.VISIBLE);
viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
viewBinding.personalDataUserNameIl.sllLlRlRightNextIv.setVisibility(View.GONE);
+ viewBinding.personalDataUserNameIl.lineV.setVisibility(View.VISIBLE);
viewBinding.personalDataMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
viewBinding.personalDataMailIl.sllLlRlRightNextIv.setVisibility(View.GONE);
+ viewBinding.personalDataMailIl.lineV.setVisibility(View.VISIBLE);
viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
viewBinding.personalDataPhoneIl.sllLlRlRightNextIv.setVisibility(View.GONE);
+ viewBinding.personalDataPhoneIl.lineV.setVisibility(View.VISIBLE);
viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.default_image));
viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getUserName());
- viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_E6000000));
String bingEmail = TextUtils.isEmpty(UserConfigManage.getInstance().getBingEmail()) ? _mActivity.getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingEmail();
viewBinding.personalDataMailIl.sllLlRlRightContentTv.setText(bingEmail);
- viewBinding.personalDataMailIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_E6000000));
String bingPhone = TextUtils.isEmpty(UserConfigManage.getInstance().getBingPhone()) ? _mActivity.getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingPhone();
viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setText(bingPhone);
- viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_E6000000));
viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));
}
--
Gitblit v1.8.0