Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

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

@@ -45,7 +45,7 @@

    private void initEvent() {

        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                setResult(20);
@@ -101,7 +101,7 @@
    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_change_bind_phone_number);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
        try {
            Country.load(this);
@@ -119,7 +119,8 @@
            public void onPick(Country country) {
                if (country.flag != 0)
                    viewBinding.bindAreaTv.setText(country.name);
                viewBinding.bindAreaNumberTv.setText("+" + country.code);
                String code = "+" + country.code;
                viewBinding.bindAreaNumberTv.setText(code);
            }
        });
        dialog.show();