Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

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

@@ -38,7 +38,7 @@

    private void initEvent() {

        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {

@@ -83,7 +83,7 @@
    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_account_security);
        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));

        if (UserConfigManage.getInstance().isBAccount()) {
@@ -95,11 +95,9 @@
            viewBinding.setAccountMailIl.parentCl.setVisibility(View.VISIBLE);

            viewBinding.setAccountPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
            viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setText(R.string.set_not_bind);
            viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);

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

@@ -113,12 +111,10 @@
     * 刷新绑定手机号和邮箱
     */
    private void updateStyle() {
        if (!TextUtils.isEmpty(UserConfigManage.getInstance().getBingPhone())) {
            viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getBingPhone());
        }
        if (!TextUtils.isEmpty(UserConfigManage.getInstance().getBingEmail())) {
            viewBinding.setAccountMailIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getBingEmail());
        }
        String phoneStr = TextUtils.isEmpty(UserConfigManage.getInstance().getBingPhone()) ? getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingPhone();
        String emailStr = TextUtils.isEmpty(UserConfigManage.getInstance().getBingEmail()) ? getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingEmail();
        viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setText(phoneStr);
        viewBinding.setAccountMailIl.sllLlRlRightContentTv.setText(emailStr);
    }

    @Override