2025-04-09 10:29:16 1.1.0

wjc

2025-04-09 6ae9f81d545f44a85c34dea1c11df8b70e3f940f

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

@@ -12,7 +12,6 @@
import android.text.method.LinkMovementMethod;
import android.text.method.PasswordTransformationMethod;
import android.text.style.ClickableSpan;
import android.text.style.StyleSpan;
import android.view.View;
import android.widget.TextView;

@@ -43,6 +42,7 @@
import com.hdl.photovoltaic.ui.me.WebActivity;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.photovoltaic.utils.TimeUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ListDialog;
@@ -66,6 +66,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_00000000));
        //初始化
        initView();
        //初始化界面监听器
@@ -121,7 +122,7 @@
                public void updateDrawState(@NonNull TextPaint ds) {
                    super.updateDrawState(ds);
                    //设置字体颜色
                    ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                    ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
                    // 去掉下划线
                    ds.setUnderlineText(true);
                }
@@ -141,7 +142,7 @@
                public void updateDrawState(@NonNull TextPaint ds) {
                    super.updateDrawState(ds);
                    //设置字体颜色
                    ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                    ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
                    // 去掉下划线
                    ds.setUnderlineText(true);
                }
@@ -170,6 +171,7 @@
//        viewBinding.homeLoginPasswordEt.setText(pws);
            checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
            isLoginTextViewEnabled();

        } catch (Exception ignored) {
        }
    }
@@ -272,11 +274,11 @@
                boolean isSelected = UserConfigManage.getInstance().isAcceiptPolicy();
                if (!isSelected) {
                    //隐私协议提示
                    getDialog();
                    getAcceiptPolicyDialog();
                    return;
                }
                //登录
                login(account, password);
                loginAccount(account, password);


            }
@@ -318,7 +320,7 @@
     * @param account  账号
     * @param password 密码
     */
    private void login(String account, String password) {
    private void loginAccount(String account, String password) {
        showLoading(getString(R.string.home_login_be_logging_in));
        HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
            @Override
@@ -338,6 +340,31 @@
                            startActivity(BPowerStationActivity.class);
                            hideLoading();
                            finish();
                            //云端还没有匹配平台好，先隐藏校验账号功能 2025年03月24日15:16:37
//                            HdlAccountLogic.getInstance().getCompanyParterMenu_B(new CloudCallBeak<Boolean>() {
//                                @Override
//                                public void onSuccess(Boolean isBoolean) {
//                                    if (isBoolean) {
//                                        //2025年03月03日14:45:17 杨涛要求b端账号需要检验权限
//                                        restoreButtonStyleToInitializeState();
//                                        //安装商跳转界面
//                                        startActivity(BPowerStationActivity.class);
//                                        hideLoading();
//                                        finish();
//                                    } else {
//                                        hideLoading();
//                                        HdlThreadLogic.toast(_mActivity, getString(R.string.forbidden_login));
//                                    }
//                                }
//
//                                @Override
//                                public void onFailure(HDLException e) {
//                                    SharedPreUtils.putBoolean("isAuthorization", false);
//                                    hideLoading();
//                                    HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
//                                }
//                            });

                        } else {
                            //C端需要先获取电站列表;
                            HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
@@ -415,16 +442,16 @@
        String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", "");
        boolean isEnabled = account.length() > 0 && password.length() > 0;
        if (isEnabled) {
            viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_E6FFFFFF));
            viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_FFACACAC));
        } else {
            viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_66FFFFFF));
            viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_FF5B5B5B));
        }
        viewBinding.homeLoginTv.setEnabled(isEnabled);
        if (password.length() < 6 || password.length() > 16) {
            return;
        }
        //符合密码规则后隐藏错误提示；
        viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_FF5A5A5A));
//        viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_FF5A5A5A));
        viewBinding.homeLoginPasswordTextErrorTv.setText("");

    }
@@ -454,19 +481,19 @@
     */
    private boolean isLocalCheckAccountAndPassword(String account, String password) {
        if (TextUtils.isEmpty(account)) {
            viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_D34545));
//            viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_D34545));
            viewBinding.homeLoginAccountTextErrorTv.setText(R.string.home_login_error_account_null);
            return false;
        }
        if (TextUtils.isEmpty(password)) {
            viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
//            viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
            viewBinding.homeLoginPasswordTextErrorTv.setText(R.string.home_login_error_password_null);
            return false;
        }


        if (password.length() < 6 || password.length() > 16) {
            viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
//            viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
            viewBinding.homeLoginPasswordTextErrorTv.setText(R.string.home_login_error_6_16_str);
            return false;
        }
@@ -481,9 +508,9 @@
        HdlThreadLogic.runMainThread(new Runnable() {
            @Override
            public void run() {
                viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_E1E1E1));
//                viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_E1E1E1));
                viewBinding.homeLoginAccountTextErrorTv.setText("");
                viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
//                viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
                viewBinding.homeLoginPasswordTextErrorTv.setText("");
            }
        }, null, null);
@@ -536,9 +563,9 @@
                    public void updateDrawState(@NonNull TextPaint ds) {
                        super.updateDrawState(ds);
                        //设置字体颜色
                        ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                        ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
                        // 去掉下划线
                        ds.setUnderlineText(true);
                        ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                    }


@@ -559,9 +586,9 @@
                    public void updateDrawState(@NonNull TextPaint ds) {
                        super.updateDrawState(ds);
                        //设置字体颜色
                        ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                        ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
                        // 去掉下划线
                        ds.setUnderlineText(true);
                        ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                    }


@@ -572,7 +599,7 @@
            }
            textView.setText(spannable);
            //中途遇到点击后字体显示高亮，取消高亮
            textView.setHighlightColor(getResources().getColor(R.color.text_66FFFFFF, null));
            textView.setHighlightColor(getResources().getColor(R.color.text_FF5B5B5B, null));
            //最后设置可点击，必须实现，否则只能显示样式，无法实现点击效果
            textView.setMovementMethod(LinkMovementMethod.getInstance());
        } catch (Exception ignored) {
@@ -584,7 +611,7 @@
    /**
     * 弹窗
     */
    private void getDialog() {
    private void getAcceiptPolicyDialog() {

        ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
        confirmationCancelDialog.show();
@@ -601,7 +628,7 @@
                confirmationCancelDialog.dismiss();
                String account = viewBinding.homeLoginAccountEt.getText().toString().replace(" ", "");
                String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", "");
                login(account, password);
                loginAccount(account, password);
            }
        });
        confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {