2025年04月09日11:10:33

wjc

2025-04-09 1793cca452c8d905ec64d26d2bfad6821f5e0c4c

2025年04月09日11:10:33

 app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java

@@ -69,7 +69,8 @@

    public static HDLException getException(HDLException e) {
        try {
            return new HDLException(e.getCode(), getErrorSting(e.getCode()), e.getmExtra());
            String str = TextUtils.isEmpty(getErrorSting(e.getCode())) ? e.getMsg() : getErrorSting(e.getCode());
            return new HDLException(e.getCode(), str, e.getmExtra());
        } catch (Exception exception) {
            return e;
        }
@@ -89,6 +90,8 @@
                    return HDLApp.getInstance().getAppLocaleContext().getString(R.string.ssl_error);
                case 1005:
                    return HDLApp.getInstance().getAppLocaleContext().getString(R.string.timeout_error);
                case 4:
                    return HDLApp.getInstance().getAppLocaleContext().getString(R.string.signature_error_log_in_again);
            }
        } catch (Exception e) {
            e.printStackTrace();

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

@@ -171,14 +171,6 @@
//        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) {
        }
    }
@@ -342,7 +334,6 @@
                    @Override
                    public void onSuccess(HDLLoginBean obj) {
                        if (UserConfigManage.getInstance().isBAccount()) {
                            SharedPreUtils.putBoolean("isAuthorization", true);
                            restoreButtonStyleToInitializeState();
                            //安装商跳转界面
                            startActivity(BPowerStationActivity.class);
@@ -352,7 +343,6 @@
//                            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();
@@ -368,7 +358,6 @@
//
//                                @Override
//                                public void onFailure(HDLException e) {
//                                    SharedPreUtils.putBoolean("isAuthorization", false);
//                                    hideLoading();
//                                    HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
//                                }

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

@@ -84,18 +84,10 @@
            //判断AccessToken是否null
            if (!TextUtils.isEmpty(HDLLinkPMUser.getInstance().getAccessToken())) {
                if (UserConfigManage.getInstance().isBAccount()) {
                    //2025年03月03日14:45:17 杨涛要求b端账号需要检验权限
                    boolean isAuthorization = SharedPreUtils.getBoolean("isAuthorization");
                    if (isAuthorization) {
                        //安装商跳转界面
                        Intent intent = new Intent();
                        intent.setClass(StartActivity.this, BPowerStationActivity.class);
                        openActivity(intent);
                    } else {
                        Intent intent = new Intent();
                        intent.setClass(StartActivity.this, LoginActivity.class);
                        openActivity(intent);
                    }
                } else {
                    //C端用户跳转界面
//                showLoading();

 app/src/main/res/values-en/strings.xml

@@ -362,4 +362,5 @@
    <string name="parse_error">Data parsing error, please try again later</string>
    <string name="ssl_error">Loading certificate error, pls try again later</string>
    <string name="timeout_error">Please check your network and try again later</string>
    <string name="signature_error_log_in_again">Signature error. Log in again</string>
</resources>

 app/src/main/res/values-zh/strings.xml

@@ -357,5 +357,6 @@
    <string name="parse_error">数据解析错误，请稍后再试</string>
    <string name="ssl_error">加载证书出错，请稍后再试</string>
    <string name="timeout_error">网络不给力，请稍后再试</string>
    v
    <string name="signature_error_log_in_again">签名错误,重新登录</string>

</resources>

 app/src/main/res/values/strings.xml

@@ -361,6 +361,7 @@
    <string name="parse_error">Data parsing error, please try again later</string>
    <string name="ssl_error">Loading certificate error, pls try again later</string>
    <string name="timeout_error">Please check your network and try again later</string>
    <string name="signature_error_log_in_again">Signature error. Log in again</string>