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/MeChangePasswordActivity.java | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java index c693283..9af24d5 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java @@ -38,8 +38,8 @@ @Override public void onBindView(Bundle savedInstanceState) { - setNotificationBarBackgroundColor(CustomColor.white); - setStatusBarTextColor(); + setStatusBarTranslucent(); + getWindow().setNavigationBarColor(getColor(R.color.text_FF000000)); //鍒濆鍖� initView(); //鍒濆鍖栫晫闈㈢洃鍚櫒 @@ -51,7 +51,7 @@ * 鍒濆鍖栫晫闈㈢洃鍚櫒 */ private void initEvent() { - viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() { + viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); @@ -163,11 +163,8 @@ * 鍒濆鍖� */ private void initView() { - viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null)); - viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.home_login_change_password); - viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null)); - viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE); - viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c); + viewBinding.toolbarTopRl.topTitleTv.setText(R.string.home_login_change_password); + viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE); viewBinding.meChangePasswordOldIc.mePswTitleTv.setText(R.string.home_login_old_pws); viewBinding.meChangePasswordOldIc.mePswEt.setHint(R.string.home_login_input_old_pws); viewBinding.meChangePasswordOldIc.lineV.setVisibility(View.GONE); @@ -190,6 +187,11 @@ String newPsw = viewBinding.meChangePasswordNewIc.mePswEt.getText().toString(); String affirmPsw = viewBinding.meChangePasswordAffirmIc.mePswEt.getText().toString(); boolean isEnabled = oldPsw.length() > 0 && newPsw.length() > 0 && affirmPsw.length() > 0; + if (isEnabled) { + viewBinding.homeAffirmTv.setTextColor(getColor(R.color.text_E6FFFFFF)); + } else { + viewBinding.homeAffirmTv.setTextColor(getColor(R.color.text_66FFFFFF)); + } viewBinding.homeAffirmTv.setEnabled(isEnabled); } @@ -203,16 +205,16 @@ */ private boolean isEditTextPassword(String oldPsw, String newPsw, String affirmPsw) { if (newPsw.length() < 6 || affirmPsw.length() < 6) { - HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_least6), -1); + HdlThreadLogic.tipFlashingBox(_mActivity, false, getString(R.string.home_login_least6), -1); return false; } if (!newPsw.equals(affirmPsw)) { //鏂板瘑鐮佸拰纭瀵嗙爜涓嶄竴鏍� - HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_input_unlike_psw), -1); + HdlThreadLogic.tipFlashingBox(_mActivity, false, getString(R.string.home_login_input_unlike_psw), -1); return false; } if (oldPsw.equals(newPsw)) { - HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_old_password_not_new_password), -1); + HdlThreadLogic.tipFlashingBox(_mActivity, false, getString(R.string.home_old_password_not_new_password), -1); return false; } return true; -- Gitblit v1.8.0