2024年01月02日18:41:32

mac

2024-01-02 d1ebb94e1a17b7c25d4fcf73d85345d92cc86b5c

 app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java

@@ -88,6 +88,12 @@
        viewBinding.homeAffirmTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                String oldPsw = viewBinding.meChangePasswordOldIc.mePswEt.getText().toString().replaceAll(" ", "");
                String newPsw = viewBinding.meChangePasswordNewIc.mePswEt.getText().toString().replaceAll(" ", "");
                String affirmPsw = viewBinding.meChangePasswordAffirmIc.mePswEt.getText().toString().replaceAll(" ", "");
                if (!isEditTextPassword(oldPsw, newPsw, affirmPsw)) {
                    return;
                }
                // 二次确认提示框
                ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(_mActivity);
                dialog.setTitle(getString(R.string.loading_title_tip));
@@ -96,7 +102,7 @@
                dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
                    @Override
                    public void Confirm() {
                        sendChangePassword();
                        sendChangePassword(oldPsw, newPsw);
                    }
                });
                dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@@ -112,25 +118,12 @@

    /**
     * 发送更改个人密码指令
     *
     * @param oldPsw 原来密码
     * @param newPsw 新密码
     */
    private void sendChangePassword() {
        String oldPsw = viewBinding.meChangePasswordOldIc.mePswEt.getText().toString().replaceAll(" +", "");
        String newPsw = viewBinding.meChangePasswordNewIc.mePswEt.getText().toString().replaceAll(" +", "");
        String affirmPsw = viewBinding.meChangePasswordAffirmIc.mePswEt.getText().toString().replaceAll(" +", "");
    private void sendChangePassword(String oldPsw, String newPsw) {

        if (isEditTextPassword(oldPsw, newPsw) || isEditTextPassword(oldPsw, affirmPsw)) {
            HdlThreadLogic.tipFlashingBox(_mActivity, true, "原密码和新密码不能一样.", -1);
            return;
        }

        if (newPsw.length() < 6 || affirmPsw.length() < 6) {
            HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_least6), -1);
            return;
        }
        if (!isEditTextPassword(newPsw, affirmPsw)) {
            HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_input_unlike_psw), -1);
            return;
        }
        if (UserConfigManage.getInstance().isBAccount()) {
            //B端更改个人密码
            HdlAccountLogic.getInstance().updatePassword_B(oldPsw, newPsw, new CloudCallBeak<String>() {
@@ -202,13 +195,26 @@
    /**
     * 本地校验密码是否正确
     *
     * @param oldPsw    原来密码
     * @param newPsw    新密码
     * @param affirmPsw 再次确认新密码
     * @return 一样返回true，否者false
     */
    private boolean isEditTextPassword(String newPsw, String affirmPsw) {
        //新密码和确认密码不一样
        return newPsw.equals(affirmPsw);
    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);
            return false;
        }
        if (!newPsw.equals(affirmPsw)) {
            //新密码和确认密码不一样
            HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_input_unlike_psw), -1);
            return false;
        }
        if (oldPsw.equals(newPsw)) {
            HdlThreadLogic.tipFlashingBox(_mActivity, true, "原密码和新密码不能一样.", -1);
            return false;
        }
        return true;

    }