Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

 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;

@@ -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);


@@ -188,9 +190,9 @@
        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));
            viewBinding.homeAffirmTv.setTextColor(getColor(R.color.text_FFACACAC));
        } else {
            viewBinding.homeAffirmTv.setTextColor(getColor(R.color.text_66FFFFFF));
            viewBinding.homeAffirmTv.setTextColor(getColor(R.color.text_FF5B5B5B));
        }
        viewBinding.homeAffirmTv.setEnabled(isEnabled);
    }