2025年03月25日13:43:20

wjc

2025-03-25 215622f6aa1420c4cf1126edce5d4ca3aa6f5967

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

@@ -50,6 +50,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;
@@ -179,6 +180,14 @@
//        viewBinding.homeLoginPasswordEt.setText(pws);
            checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
            isLoginTextViewEnabled();
            if (UserConfigManage.getInstance().isBAccount()) {
                boolean is_Authorization = SharedPreUtils.getBoolean("isAuthorization");
                if (!is_Authorization) {
                    //2025年03月03日14:45:17 杨涛要求b端账号需要检验权限
                    HdlThreadLogic.toast(_mActivity, getString(R.string.forbidden_login));
                }
            }

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


            }
@@ -327,7 +336,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
@@ -342,26 +351,37 @@
                    @Override
                    public void onSuccess(HDLLoginBean obj) {
                        if (UserConfigManage.getInstance().isBAccount()) {
                            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 {
                                        HdlThreadLogic.toast(_mActivity, getString(R.string.forbidden_login));
                                    }
                                }

                                @Override
                                public void onFailure(HDLException e) {
                                    HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
                                }
                            });
                            SharedPreUtils.putBoolean("isAuthorization", true);
                            restoreButtonStyleToInitializeState();
                            //安装商跳转界面
                            startActivity(BPowerStationActivity.class);
                            hideLoading();
                            finish();
                            //云端还没有匹配平台好，先隐藏校验账号功能 2025年03月24日15:16:37
//                            HdlAccountLogic.getInstance().getCompanyParterMenu_B(new CloudCallBeak<Boolean>() {
//                                @Override
//                                public void onSuccess(Boolean isBoolean) {
//                                    SharedPreUtils.putBoolean("isAuthorization", 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端需要先获取电站列表;
@@ -563,7 +583,7 @@
                        //设置字体颜色
                        ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                        // 去掉下划线
                        ds.setUnderlineText(true);
                        ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                    }


@@ -586,7 +606,7 @@
                        //设置字体颜色
                        ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                        // 去掉下划线
                        ds.setUnderlineText(true);
                        ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                    }


@@ -609,7 +629,7 @@
    /**
     * 弹窗
     */
    private void getDialog() {
    private void getAcceiptPolicyDialog() {

        ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
        confirmationCancelDialog.show();
@@ -626,7 +646,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() {