From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 7f0c976..2798636 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
@@ -20,6 +20,7 @@
import com.hdl.photovoltaic.databinding.ActivityMeChangePasswordBinding;
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 +39,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -129,6 +130,7 @@
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);
}
@@ -143,7 +145,7 @@
HdlAccountLogic.getInstance().updatePassword_C(oldPsw, newPsw, new CloudCallBeak<String>() {
@Override
public void onSuccess(String obj) {
-
+ HdlLogLogic.print("C绔洿鏀逛釜浜哄瘑鐮侀��鍑虹櫥褰�--->", true);
HDLLinkPMUser.getInstance().logout(0);
@@ -163,11 +165,8 @@
* 鍒濆鍖�
*/
private void initView() {
- viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
viewBinding.toolbarTopRl.topTitleTv.setText(R.string.home_login_change_password);
- viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
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 +189,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 +207,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