Merge branch 'dev' into 2.1.0

wjc

2026-03-26 d4a638c6d3ad6aacf3273c601ac9140d137ae54f

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

@@ -13,6 +13,7 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityBindPhoneBinding;
import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.enums.VerifyType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
@@ -109,7 +110,7 @@
    }

    private void initView() {
        if (UserConfigManage.getInstance().isZh()) {
        if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
            viewBinding.bindAreaTv.setText(getText(R.string.home_chinese_mainland));
            viewBinding.bindAreaNumberTv.setText("+86");
        } else {
@@ -137,6 +138,10 @@
            e.printStackTrace();
        }
        HdlCommonLogic.getInstance().setSpan(viewBinding.bindPhoneVerificationTv, viewBinding.bindPhoneVerificationTv.getText().toString(), true, null);

        if (UserConfigManage.getInstance().isArabicLanguage()) {
            viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 旋转180度
        }
    }

    /**
@@ -226,9 +231,9 @@
        String verificationCode = viewBinding.changePhoneVerificationEt.getText().toString().replace(" ", "");
        boolean isEnabled = account.length() > 0 && verificationCode.length() > 0;
        if (isEnabled) {
            viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_E6FFFFFF));
            viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_FFACACAC));
        } else {
            viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_66FFFFFF));
            viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_FF5B5B5B));
        }
        viewBinding.bindPhoneTv.setEnabled(isEnabled);
        return isEnabled;