Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java

@@ -178,7 +178,7 @@
                    verification_code = viewBinding.changeMailVerificationEt.getText().toString();
                }
                if (UserConfigManage.getInstance().isBAccount()) {
                    HdlAccountLogic.getInstance().changeBPassword(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
                    HdlAccountLogic.getInstance().changePassword_B(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
                        @Override
                        public void onSuccess(Boolean obj) {
                            HdlThreadLogic.runMainThread(new Runnable() {
@@ -199,11 +199,11 @@

                        @Override
                        public void onFailure(HDLException e) {

                            HdlThreadLogic.toast(_mActivity, e);
                        }
                    });
                } else {
                    HdlAccountLogic.getInstance().changeCPassword(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
                    HdlAccountLogic.getInstance().changePassword_C(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
                        @Override
                        public void onSuccess(Boolean obj) {
                            HdlThreadLogic.runMainThread(new Runnable() {
@@ -224,7 +224,7 @@

                        @Override
                        public void onFailure(HDLException e) {

                            HdlThreadLogic.toast(_mActivity, e);
                        }
                    });
                }
@@ -267,14 +267,14 @@

                    @Override
                    public void onFailure(HDLException e) {

                        HdlThreadLogic.toast(_mActivity, e);
                    }
                });
            }

            @Override
            public void onFailure(HDLException e) {

                HdlThreadLogic.toast(_mActivity, e);
//                hideLoading();
            }
        });
@@ -335,12 +335,12 @@
            //手机号
            viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.changePhoneIc.accountTitleTv.setTextSize(20);
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000));
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6000000));
            viewBinding.changePhoneIc.lineV.setVisibility(View.VISIBLE);

            viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.changeMailRl.accountTitleTv.setTextSize(16);
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000));
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66000000));
            viewBinding.changeMailRl.lineV.setVisibility(View.GONE);

            //输入手机号
@@ -365,12 +365,12 @@
            //邮箱
            viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.changePhoneIc.accountTitleTv.setTextSize(16);
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000));
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66000000));
            viewBinding.changePhoneIc.lineV.setVisibility(View.GONE);

            viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.changeMailRl.accountTitleTv.setTextSize(20);
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000));
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6000000));
            viewBinding.changeMailRl.lineV.setVisibility(View.VISIBLE);
            //输入邮箱
            viewBinding.changeAccountEt.setInputType(InputType.TYPE_CLASS_TEXT);