Merge branch '1.5.1'

wjc

2025-02-07 e57e1c01a52a326343122d458ad3bd330fc9d347

 app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java

@@ -687,6 +687,36 @@
    }

    /**
     * 注销账号(C端账号)
     *
     * @param pwd           账号密码
     * @param cloudCallBeak -
     */
    public void accountUnregisterC(String pwd, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.C_POST_MEMBER_UNREGISTER;
        JsonObject json = new JsonObject();
        json.addProperty("userId", UserConfigManage.getInstance().getUserId());
        json.addProperty("pwd", pwd);
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(true);
                }
            }

            @Override
            public void onFailure(HDLException e) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }
            }
        });


    }

    /**
     * 登录成功保存登录信息
     */
    private void saveUserData(HDLLoginBean obj) {
@@ -697,6 +727,8 @@
            if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserId()) && !UserConfigManage.getInstance().isTheSameLoginAccount()) {
                //不同账号,删除之前的旧账号日志信息;
                HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentUserRootPath());
                HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getUserFilePath());
                UserConfigManage.getInstance().setHomeId("");
            }
            UserConfigManage.getInstance().setLogin(true);//是否登录
            UserConfigManage.getInstance().setAcceiptPolicy(true);//是否选择隐私政策