mac
2023-12-01 593303fa91fd541844b204ec913c462d7855a31e
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
@@ -28,8 +28,7 @@
import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
import com.hdl.photovoltaic.widget.ListDialog;
import com.hdl.sdk.link.common.utils.ThreadToolUtils;
import com.hdl.photovoltaic.widget.ListStaticDialog;
/**
 * 注册账号界面
@@ -91,7 +90,7 @@
    private void initView() {
        switchPhoneOrMailView();
        switchPhoneOrEmailStyleView();
    }
    private void initEvent() {
@@ -105,21 +104,23 @@
        viewBinding.registerRegionServerRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                ListDialog listDialog = new ListDialog(_mActivity);
                ListStaticDialog listDialog = new ListStaticDialog(_mActivity);
                listDialog.show();
                listDialog.setOnHDLChinaOnListener(new ListDialog.onHDLChinaListener() {
                listDialog.setOnHDLChinaOnListener(new ListStaticDialog.onHDLChinaListener() {
                    @Override
                    public void HDLChina() {
                        mUrl = "https://china-gateway.hdlcontrol.com";
                        viewBinding.regionTv.setText(listDialog.geHDLChinaText());
                        listDialog.dismiss();
                    }
                });
                listDialog.setOnHDLBahrainListener(new ListDialog.onHDLBahrainListener() {
                listDialog.setOnHDLBahrainListener(new ListStaticDialog.onHDLBahrainListener() {
                    @Override
                    public void HDLBahrain() {
                        mUrl = "https://bahrain-gateway.hdlcontrol.com";
                        viewBinding.regionTv.setText(listDialog.getHDLBahrainText());
                        listDialog.dismiss();
                    }
                });
            }
@@ -130,7 +131,7 @@
            public void onClick(View v) {
                isPhoneType = true;
                switchPhoneOrMailView();
                switchPhoneOrEmailStyleView();
            }
        });
        //切换邮箱
@@ -138,7 +139,7 @@
            @Override
            public void onClick(View v) {
                isPhoneType = false;
                switchPhoneOrMailView();
                switchPhoneOrEmailStyleView();
            }
        });
@@ -222,7 +223,7 @@
                } else {
                    verification_code = viewBinding.registerMailVerificationEt.getText().toString();
                }
                HdlAccountLogic.getInstance().registerAccount(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
                HdlAccountLogic.getInstance().registerAccount_C(isPhoneType, account, psw, verification_code, new CloudCallBeak<Boolean>() {
                    @Override
                    public void onSuccess(Boolean obj) {
                        HdlThreadLogic.runMainThread(new Runnable() {
@@ -271,9 +272,8 @@
        HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
            @Override
            public void onSuccess(HDLUserRegionBean obj) {
                //发送消息验证码
                HdlThreadLogic.toast(RegisterAccountActivity.this, getString(R.string.home_login_already_exists));
                HdlLogLogic.print("regionByAccount onSuccess==" + obj);
                HdlLogLogic.print("获取账号区域信息===" + obj, false);
            }
            @Override
@@ -318,7 +318,7 @@
            long time = (millisUntilFinished / 1000);
            String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
            viewBinding.registerPhoneVerificationTv.setText(str);
            viewBinding.registerPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000));
            viewBinding.registerPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000, null));
            viewBinding.registerPhoneVerificationTv.setEnabled(false);
        }
@@ -326,7 +326,7 @@
        @Override
        public void onFinish() {
            viewBinding.registerPhoneVerificationTv.setText(getString(R.string.home_login_verification_regain));
            viewBinding.registerPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3));
            viewBinding.registerPhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3, null));
            viewBinding.registerPhoneVerificationTv.setEnabled(true);
@@ -342,7 +342,7 @@
            String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
            viewBinding.registerMailVerificationTv.setText(str);
            viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000));
            viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_25000000, null));
            viewBinding.registerMailVerificationTv.setEnabled(false);
        }
@@ -350,7 +350,7 @@
        @Override
        public void onFinish() {
            viewBinding.registerMailVerificationTv.setText(getString(R.string.home_login_verification_regain));
            viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3));
            viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_245EC3, null));
            viewBinding.registerMailVerificationTv.setEnabled(true);
        }
@@ -359,22 +359,22 @@
    /**
     * 切换手机号或者邮箱的样式
     */
    private void switchPhoneOrMailView() {
    private void switchPhoneOrEmailStyleView() {
        if (isPhoneType) {
            //手机号
            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_手机号);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(20);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000));
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000, null));
            viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.VISIBLE);
            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_邮箱);
            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(16);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000));
            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000, null));
            viewBinding.registerMailTitleIc.lineV.setVisibility(View.GONE);
            //输入手机号
            viewBinding.registerAccountEt.setInputType(InputType.TYPE_CLASS_NUMBER);
            viewBinding.registerAccountEt.setHint(R.string.home_login_请输入手机号);
            viewBinding.registerAccountEt.setHint(R.string.home_login_input_phone);
            //显示手机号验证码,隐藏邮箱验证码,
            viewBinding.registerPhoneVerificationCodeRl.setVisibility(View.VISIBLE);
            viewBinding.registerMailVerificationCodeRl.setVisibility(View.GONE);
@@ -392,14 +392,14 @@
        } else {
            //邮箱
            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_手机号);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(16);
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000));
            viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000, null));
            viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.GONE);
            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_邮箱);
            viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(20);
            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000));
            viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000, null));
            viewBinding.registerMailTitleIc.lineV.setVisibility(View.VISIBLE);
            //输入邮箱
            viewBinding.registerAccountEt.setInputType(InputType.TYPE_CLASS_TEXT);