From a8a25a3ae373115f9342c766a7ee241e8ca8f479 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 15 七月 2025 15:20:34 +0800 Subject: [PATCH] 2025年07月15日15:20:32 --- app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 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..fa765ae 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 @@ -18,8 +18,10 @@ import com.hdl.photovoltaic.base.CustomBaseActivity; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.ActivityMeChangePasswordBinding; +import com.hdl.photovoltaic.enums.LogoutType; import com.hdl.photovoltaic.listener.CloudCallBeak; import com.hdl.photovoltaic.other.HdlAccountLogic; +import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; import com.hdl.photovoltaic.widget.ConfirmationCancelDialog; @@ -38,8 +40,8 @@ @Override public void onBindView(Bundle savedInstanceState) { - setNotificationBarBackgroundColor(CustomColor.white); - setStatusBarTextColor(); + setStatusBarTranslucent(); + getWindow().setNavigationBarColor(getColor(R.color.text_FF000000)); //鍒濆鍖� initView(); //鍒濆鍖栫晫闈㈢洃鍚櫒 @@ -51,7 +53,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(); @@ -102,6 +104,7 @@ dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() { @Override public void Confirm() { + dialog.dismiss(); sendChangePassword(oldPsw, newPsw); } }); @@ -123,14 +126,15 @@ * @param newPsw 鏂板瘑鐮� */ private void sendChangePassword(String oldPsw, String newPsw) { - if (UserConfigManage.getInstance().isBAccount()) { //B绔洿鏀逛釜浜哄瘑鐮� HdlAccountLogic.getInstance().updatePassword_B(oldPsw, newPsw, new CloudCallBeak<String>() { @Override public void onSuccess(String str) { + HdlLogLogic.print("B绔洿鏀逛釜浜哄瘑鐮侀��鍑虹櫥褰�--->", true); // HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_pws_reset_succeeded), 0); - HDLLinkPMUser.getInstance().logout(0); +// HDLLinkPMUser.getInstance().logout(0); + HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout); } @Override @@ -143,8 +147,9 @@ HdlAccountLogic.getInstance().updatePassword_C(oldPsw, newPsw, new CloudCallBeak<String>() { @Override public void onSuccess(String obj) { - - HDLLinkPMUser.getInstance().logout(0); + HdlLogLogic.print("C绔洿鏀逛釜浜哄瘑鐮侀��鍑虹櫥褰�--->", true); +// HDLLinkPMUser.getInstance().logout(0); + HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout); } @@ -163,11 +168,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 +192,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_FFACACAC)); + } else { + viewBinding.homeAffirmTv.setTextColor(getColor(R.color.text_FF5B5B5B)); + } viewBinding.homeAffirmTv.setEnabled(isEnabled); } @@ -203,16 +210,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