Merge branch '1.5.1'

wjc

2025-02-07 e57e1c01a52a326343122d458ad3bd330fc9d347

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

@@ -28,7 +28,7 @@

    @Override
    public void onBindView(Bundle savedInstanceState) {
       setStatusBarTranslucent();
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化
        initView();
@@ -70,10 +70,10 @@
            }
        });

        viewBinding.setAccountClose.setOnClickListener(new View.OnClickListener() {
        viewBinding.setAccountCloseIl.getRoot().setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {

                startActivity(UnregisterActivity.class);
            }
        });

@@ -88,6 +88,7 @@
            //云端接口不支持
            viewBinding.setAccountPhoneIl.parentCl.setVisibility(View.GONE);
            viewBinding.setAccountMailIl.parentCl.setVisibility(View.GONE);
            viewBinding.setAccountCloseIl.parentCl.setVisibility(View.GONE);
        } else {
            viewBinding.setAccountPhoneIl.parentCl.setVisibility(View.VISIBLE);
            viewBinding.setAccountMailIl.parentCl.setVisibility(View.VISIBLE);
@@ -98,6 +99,9 @@

            viewBinding.setAccountMailIl.sllLlRlNameTv.setText(R.string.set_email_address);
            viewBinding.setAccountMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);

            viewBinding.setAccountCloseIl.sllLlRlNameTv.setText(R.string.set_close_account);
            viewBinding.setAccountCloseIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
        }

        viewBinding.setChangePswIl.sllLlRlNameTv.setText(R.string.home_login_change_password);