Merge branch '1.5.1'

wjc

2025-02-07 e57e1c01a52a326343122d458ad3bd330fc9d347

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

@@ -1,11 +1,16 @@
package com.hdl.photovoltaic.ui.me;


import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;

import androidx.annotation.Nullable;

import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityAccountAndSecurityBinding;

/**
@@ -13,6 +18,7 @@
 */
public class AccountAndSecurityActivity extends CustomBaseActivity {
    private ActivityAccountAndSecurityBinding viewBinding;


    @Override
    public Object getContentView() {
@@ -22,8 +28,8 @@

    @Override
    public void onBindView(Bundle savedInstanceState) {
        setNotificationBarBackgroundColor(CustomColor.white);
        setStatusBarTextColor();
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化
        initView();
        //初始化界面监听器
@@ -32,9 +38,10 @@

    private void initEvent() {

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

                finish();
            }
        });
@@ -42,13 +49,17 @@
        viewBinding.setAccountPhoneIl.getRoot().setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {

                Intent intent = new Intent();
                intent.setClass(_mActivity, BindPhoneActivity.class);
                startActivityForResult(intent, 20);
            }
        });
        viewBinding.setAccountMailIl.getRoot().setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {

                Intent intent = new Intent();
                intent.setClass(_mActivity, BindMailActivity.class);
                startActivityForResult(intent, 20);
            }
        });

@@ -59,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);
            }
        });

@@ -70,19 +81,50 @@
    }

    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.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.set_account_security);
        viewBinding.toolbarTopRl.topBackLl.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);
        if (UserConfigManage.getInstance().isBAccount()) {
            //云端接口不支持
            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);

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

            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);
        updateStyle();


    }

    /**
     * 刷新绑定手机号和邮箱
     */
    private void updateStyle() {
        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
    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
        super.onActivityResult(requestCode, resultCode, data);
        if (requestCode == 20 && resultCode == 20) {
            updateStyle();
        }
    }
}