Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

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

@@ -5,18 +5,13 @@
import android.os.CountDownTimer;
import android.text.Editable;
import android.text.InputType;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.PasswordTransformationMethod;
import android.text.style.ClickableSpan;
import android.view.View;
import android.widget.TextView;


import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;

import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -27,12 +22,17 @@
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityChangePasswordBinding;
import com.hdl.photovoltaic.enums.VerifyType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.utils.GPSManagerUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
import com.sahooz.library.countrypicker.Country;
import com.sahooz.library.countrypicker.CountryPickerFragment;
import com.sahooz.library.countrypicker.PickCountryCallback;

/**
 * 忘记密码界面
@@ -72,9 +72,33 @@
     * 初始化界面
     */
    private void initView() {
        if (UserConfigManage.getInstance().isZh()) {
            viewBinding.regionAccountTv.setText(getText(R.string.home_chinese_mainland));
            viewBinding.regionAccountNumberTv.setText("+86");
        } else {
            viewBinding.regionAccountTv.setText(getText(R.string.iraq));
            viewBinding.regionAccountNumberTv.setText("+964");
        }
        switchPhoneOrMailView();
        HdlCommonLogic.getInstance().setSpan(viewBinding.changePhoneVerificationTv, viewBinding.changePhoneVerificationTv.getText().toString(), true,null);
        HdlCommonLogic.getInstance().setSpan(viewBinding.changeMailVerificationTv, viewBinding.changeMailVerificationTv.getText().toString(), true,null);
        try {
            Country.load(this);
            Country country = null;
            if (TextUtils.isEmpty(GPSManagerUtils.getInstance().getCountryCode(this))) {
                //再根据系统语言
                country = Country.getCountryInfo();
            } else {
                //先根据定位
                country = Country.getLocationCountryInfo(GPSManagerUtils.getInstance().getCountryCode(this));
            }
            if (country != null) {
                viewBinding.regionAccountTv.setText(country.translate);
                viewBinding.regionAccountNumberTv.setText("+" + country.code);
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        HdlCommonLogic.getInstance().setSpan(viewBinding.changePhoneVerificationTv, viewBinding.changePhoneVerificationTv.getText().toString(), true, null);
        HdlCommonLogic.getInstance().setSpan(viewBinding.changeMailVerificationTv, viewBinding.changeMailVerificationTv.getText().toString(), true, null);
    }


@@ -108,6 +132,14 @@

            }
        });
        //选择手机区号的
        viewBinding.regionAccountRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                selectArea();
            }
        });

        //输入手机号或者邮箱
        viewBinding.changeAccountEt.addTextChangedListener(accountTextWatcher);
        //手机号获取验证码
@@ -189,7 +221,7 @@
                    verification_code = viewBinding.changeMailVerificationEt.getText().toString();
                }
                if (UserConfigManage.getInstance().isBAccount()) {
                    HdlAccountLogic.getInstance().changePassword_B(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
                    HdlAccountLogic.getInstance().changePassword_B(isPhoneType, account, psw, verification_code, viewBinding.regionAccountNumberTv.getText().toString(), new CloudCallBeak<Boolean>() {
                        @Override
                        public void onSuccess(Boolean obj) {
                            HdlThreadLogic.runMainThread(new Runnable() {
@@ -214,7 +246,7 @@
                        }
                    });
                } else {
                    HdlAccountLogic.getInstance().changePassword_C(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
                    HdlAccountLogic.getInstance().changePassword_C(isPhoneType, account, psw, verification_code, viewBinding.regionAccountNumberTv.getText().toString(), new CloudCallBeak<Boolean>() {
                        @Override
                        public void onSuccess(Boolean obj) {
                            HdlThreadLogic.runMainThread(new Runnable() {
@@ -245,6 +277,21 @@
    }

    /**
     * 国家手机号区号弹窗
     */
    private void selectArea() {
        CountryPickerFragment dialog = new CountryPickerFragment(this, new PickCountryCallback() {
            @Override
            public void onPick(Country country) {
                if (country.flag != 0) viewBinding.regionAccountTv.setText(country.translate);
                viewBinding.regionAccountNumberTv.setText("+" + country.code);
            }
        });
        dialog.show();
        dialog.setDialogSize();
    }

    /**
     * 发送验证码指令
     */
    private void sendVerification() {
@@ -266,21 +313,43 @@
                //设置账号所在区域协议及地址
                AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
                HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
                HdlAccountLogic.getInstance().sendVerifyCode(isPhoneType, account, "86", 2, new CloudCallBeak<Boolean>() {
                    @Override
                    public void onSuccess(Boolean obj) {
                        if (isPhoneType) {
                            phoneCountDownTimer.start();
                        } else {
                            mailCountDownTimer.start();
                        }
                    }

                    @Override
                    public void onFailure(HDLException e) {
                        HdlThreadLogic.toast(_mActivity, e);
                    }
                });

                if (UserConfigManage.getInstance().isBAccount()) {
                    //B端发送获取验证码
                    HdlAccountLogic.getInstance().sendVerifyCode_B(isPhoneType, account, viewBinding.regionAccountNumberTv.getText().toString(), VerifyType.VerifyType_FIND_PASSWORD, new CloudCallBeak<Boolean>() {
                        @Override
                        public void onSuccess(Boolean obj) {
                            if (isPhoneType) {
                                phoneCountDownTimer.start();
                            } else {
                                mailCountDownTimer.start();
                            }
                        }

                        @Override
                        public void onFailure(HDLException e) {
                            HdlThreadLogic.toast(_mActivity, e);
                        }
                    });
                } else {
                    //C端发送获取验证码
                    HdlAccountLogic.getInstance().sendVerifyCode_C(isPhoneType, account, viewBinding.regionAccountNumberTv.getText().toString(), VerifyType.VerifyType_2, new CloudCallBeak<Boolean>() {
                        @Override
                        public void onSuccess(Boolean obj) {
                            if (isPhoneType) {
                                phoneCountDownTimer.start();
                            } else {
                                mailCountDownTimer.start();
                            }
                        }

                        @Override
                        public void onFailure(HDLException e) {
                            HdlThreadLogic.toast(_mActivity, e);
                        }
                    });
                }
            }

            @Override
@@ -300,7 +369,7 @@
            long time = (millisUntilFinished / 1000);
            String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
            viewBinding.changePhoneVerificationTv.setText(str);
//            viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
//            viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
            viewBinding.changePhoneVerificationTv.setEnabled(false);

        }
@@ -308,7 +377,7 @@
        @Override
        public void onFinish() {
            viewBinding.changePhoneVerificationTv.setText(getString(R.string.home_login_verification_regain));
//            viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
//            viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
            viewBinding.changePhoneVerificationTv.setEnabled(true);


@@ -324,7 +393,7 @@
            String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);

            viewBinding.changeMailVerificationTv.setText(str);
//            viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
//            viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
            viewBinding.changeMailVerificationTv.setEnabled(false);

        }
@@ -332,7 +401,7 @@
        @Override
        public void onFinish() {
            viewBinding.changeMailVerificationTv.setText(getString(R.string.home_login_verification_regain));
//            viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
//            viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
            viewBinding.changeMailVerificationTv.setEnabled(true);

        }
@@ -346,14 +415,16 @@
            //手机号
            viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.changePhoneIc.accountTitleTv.setTextSize(18);
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
            viewBinding.changePhoneIc.lineV.setVisibility(View.VISIBLE);

            viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.changeMailRl.accountTitleTv.setTextSize(14);
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
            viewBinding.changeMailRl.lineV.setVisibility(View.GONE);


            viewBinding.regionAccountRl.setVisibility(View.VISIBLE);
            //输入手机号
            viewBinding.changeAccountEt.setInputType(InputType.TYPE_CLASS_NUMBER);
            viewBinding.changeAccountEt.setHint(R.string.home_login_input_phone);
@@ -376,13 +447,15 @@
            //邮箱
            viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.changePhoneIc.accountTitleTv.setTextSize(14);
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
            viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
            viewBinding.changePhoneIc.lineV.setVisibility(View.GONE);

            viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.changeMailRl.accountTitleTv.setTextSize(18);
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
            viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
            viewBinding.changeMailRl.lineV.setVisibility(View.VISIBLE);

            viewBinding.regionAccountRl.setVisibility(View.GONE);
            //输入邮箱
            viewBinding.changeAccountEt.setInputType(InputType.TYPE_CLASS_TEXT);
            viewBinding.changeAccountEt.setHint(R.string.home_login_input_mail);
@@ -422,9 +495,9 @@
        }
        boolean isEnabled = account.length() > 0 && psw1.length() > 0 && psw2.length() > 0 && verification_code.length() > 0;
        if (isEnabled) {
            viewBinding.confirmTv.setTextColor(getColor(R.color.text_E6FFFFFF));
            viewBinding.confirmTv.setTextColor(getColor(R.color.text_FFACACAC));
        } else {
            viewBinding.confirmTv.setTextColor(getColor(R.color.text_66FFFFFF));
            viewBinding.confirmTv.setTextColor(getColor(R.color.text_FF5B5B5B));
        }
        viewBinding.confirmTv.setEnabled(isEnabled);
    }