Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

 app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java

@@ -30,6 +30,8 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
@@ -47,6 +49,7 @@
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog1;
import com.hdl.photovoltaic.widget.ListDialog;
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
import com.hdl.sdk.link.common.exception.HDLLinkException;

import java.util.List;

@@ -117,14 +120,14 @@
        } else {
            viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
        }

//        String acc = "18402017839";
//        String acc = "13375012441";
////        String acc = "18316672920";
////        String acc = "nuy13368@uzxia.com";ß
//        String acc = "18316672920";
//        String pws = "123456";
//        //测试用
//        viewBinding.homeLoginAccountEt.setText(acc);
        //测试用
        viewBinding.homeLoginAccountEt.setText(UserConfigManage.getInstance().getAccount());
//        viewBinding.homeLoginPasswordEt.setText(pws);
        checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
        isLoginTextViewEnabled();
    }

@@ -164,15 +167,18 @@
            }
        });

        //输入账号
        viewBinding.homeLoginAccountEt.addTextChangedListener(accountTextWatcher);
        //清除账号按钮
        viewBinding.homeLoginClearContentsIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                viewBinding.homeLoginAccountEt.setText("");
            }
        });

        //输入密码
        viewBinding.homeLoginPasswordEt.addTextChangedListener(passwordTextWatcher);
        //密码隐藏按钮
        viewBinding.homeLoginHideIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
@@ -200,7 +206,7 @@
                UserConfigManage.getInstance().setBAccount(v.isSelected());
                viewBinding.homeLoginCheckBCIv.setSelected(UserConfigManage.getInstance().isBAccount());
                if (UserConfigManage.getInstance().isBAccount()) {
                    viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
                    viewBinding.homeLoginRegisterTv.setVisibility(View.INVISIBLE);
                } else {
                    viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
                }
@@ -369,6 +375,21 @@
    }

    /**
     * 检测清除图标是否显示
     */
    private void checkClearIconShowOrNot(String s) {
        if (s.replace(" ", "").length() > 0) {
            if (viewBinding.homeLoginClearContentsIv.getVisibility() == View.GONE) {
                viewBinding.homeLoginClearContentsIv.setVisibility(View.VISIBLE);
            }
        } else {
            if (viewBinding.homeLoginClearContentsIv.getVisibility() == View.VISIBLE) {
                viewBinding.homeLoginClearContentsIv.setVisibility(View.GONE);
            }
        }
    }

    /**
     * 本地校验输入账号或者密码是否正确
     *
     * @param account  账号
@@ -496,27 +517,28 @@
     * 弹窗
     */
    private void getDialog() {
        ConfirmationCancelDialog1 dialog = new ConfirmationCancelDialog1(_mActivity);
        dialog.show();
//        dialog.setTitle(getString(R.string.loading_privacy));
        dialog.isHideTitle(true);
        dialog.setContent(getString(R.string.loading_privacy_server));
        setStringDifferentColors(dialog.getContentTextView());
        dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {

        ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
        confirmationCancelDialog.show();
        confirmationCancelDialog.isHideTitle(true);
        confirmationCancelDialog.setContent(getString(R.string.loading_privacy_server));
        setStringDifferentColors(confirmationCancelDialog.getContentTextView());
        confirmationCancelDialog.setConfirmation(getString(R.string.loading_agree));
        confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
        confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
            @Override
            public void Confirm() {

                UserConfigManage.getInstance().setAcceiptPolicy(true);
                viewBinding.homeLoginPrivacyCheckIv.setSelected(true);
                dialog.dismiss();
                confirmationCancelDialog.dismiss();
            }
        });
        dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
        confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
            @Override
            public void Cancel() {
                UserConfigManage.getInstance().setAcceiptPolicy(false);
                viewBinding.homeLoginPrivacyCheckIv.setSelected(false);
                dialog.dismiss();
                confirmationCancelDialog.dismiss();
            }
        });

@@ -537,15 +559,7 @@

        @Override
        public void afterTextChanged(Editable s) {
            if (s.length() > 0) {
                if (viewBinding.homeLoginClearContentsIv.getVisibility() == View.GONE) {
                    viewBinding.homeLoginClearContentsIv.setVisibility(View.VISIBLE);
                }
            } else {
                if (viewBinding.homeLoginClearContentsIv.getVisibility() == View.VISIBLE) {
                    viewBinding.homeLoginClearContentsIv.setVisibility(View.GONE);
                }
            }
            checkClearIconShowOrNot(s.toString());
            isLoginTextViewEnabled();
        }
    };