2023年10月19日17:10:30

mac

2023-10-19 6139d9d4b4d42d43039fc5cec7c064d9cc20725b

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

@@ -110,8 +110,8 @@
     * @param verifyCode    验证码
     * @param cloudCallBeak -
     */
    public void changePassword(boolean isPhone, String account, String loginPwd, String verifyCode, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_FORGET_PROGRAM_PWD;
    public void changeBPassword(boolean isPhone, String account, String loginPwd, String verifyCode, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.B_POST_FORGET_PROGRAM_PWD;
        JsonObject json = new JsonObject();
        if (isPhone) {
            json.addProperty("userPhone", account);//用户手机号 手机号和邮箱必填其一
@@ -121,7 +121,6 @@
        json.addProperty("loginPwd", loginPwd);//新密码
        json.addProperty("verifyCode", verifyCode);//验证码
//       json.addProperty("platform", "APP");
        json.addProperty("grantType", "password");

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
@@ -143,7 +142,198 @@
    }

    /**
     * 修改密码(B端账号)
     * 更改个人密码(B端账号)
     *
     * @param loginOldPwd 老密码
     * @param loginPwd    新密码
     */
    public void updateBPassword(String loginOldPwd, String loginPwd, CloudCallBeak<String> cloudCallBeak) {
        String requestUrl = HttpApi.B_POST_UPDATE_PROGRAM_PASSWORD;
        JsonObject json = new JsonObject();
        json.addProperty("userId", UserConfigManage.getInstance().getUserId());
        json.addProperty("loginOldPwd", loginOldPwd);//   老密码
        json.addProperty("loginPwd", loginPwd);//新密码
        json.addProperty("confirmLoginPwd", loginPwd);//新密码确认密码
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String str) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(str);
                }
            }

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


    }


    /**
     * 刷新Token(B端账号)
     *
     * @param account       手机或者邮箱
     * @param loginPwd      密码
     * @param cloudCallBeak -
     */
    public void refreshToken(String account, String loginPwd, CloudCallBeak<HDLLoginBean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Login;
        JsonObject json = new JsonObject();
        json.addProperty("grantType", "refresh_token");
//        json.addProperty("refreshToken", UserConfigManage.getInstance().getRefreshToken());
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
                Gson gson = new Gson();
                HDLLoginBean loginBean = gson.fromJson(jsonStr, HDLLoginBean.class);
//                    saveUserData(loginBean);
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(loginBean);
                }
            }

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


    // endregion

    // region --------【C端账号】---------

    /**
     * 注册账号(C端账号)
     * 注意:B
     *
     * @param isPhone       true表示手机号,否则是邮箱
     * @param account       账号 (手机或者邮箱)
     * @param loginPwd      密码
     * @param verifyCode    验证码
     * @param cloudCallBeak -
     */
    public void registerAccount(boolean isPhone, String account, String loginPwd, String verifyCode, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.C_POST_GET_OAUTH_REGISTER;
        JsonObject json = new JsonObject();
        if (isPhone) {
            json.addProperty("memberPhone", account);//用户手机号 手机号和邮箱必填其一
        } else {
            json.addProperty("memberEmail", account);
        }
        json.addProperty("loginPwd", loginPwd);//登陆密码，需要MD5处理
        json.addProperty("verifyCode", verifyCode);//验证码
//       json.addProperty("platform", "APP");
//        json.addProperty("memberName", "memberName");//会员昵称

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String str) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(true);
                }
            }

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


    }


    /**
     * 修改密码(C端账号)
     *
     * @param isPhone       true表示手机号,否则是邮箱
     * @param account       账号 (手机或者邮箱)
     * @param loginPwd      新密码
     * @param verifyCode    验证码
     * @param cloudCallBeak -
     */
    public void changeCPassword(boolean isPhone, String account, String loginPwd, String verifyCode, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.C_POST_FORGET_PROGRAM_PWD;
        JsonObject json = new JsonObject();
        if (isPhone) {
            json.addProperty("memberPhone", account);//用户手机号 手机号和邮箱必填其一
        } else {
            json.addProperty("memberEmail", account);
        }
        json.addProperty("loginPwd", loginPwd);//新密码
        json.addProperty("verifyCode", verifyCode);//验证码
//       json.addProperty("platform", "APP");

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String str) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(true);
                }
            }

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


    }


    /**
     * 更改个人密码(C端账号)
     *
     * @param loginOldPwd 老密码
     * @param loginPwd    新密码
     */
    public void updateCPassword(String loginOldPwd, String loginPwd, CloudCallBeak<String> cloudCallBeak) {
        String requestUrl = HttpApi.C_POST_UPDATE_PROGRAM_PASSWORD;
        JsonObject json = new JsonObject();
        json.addProperty("loginPwd", loginOldPwd);//老密码
        json.addProperty("loginNewPwd", loginPwd);//新密码
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String str) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(str);
                }
            }

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


    }





    // endregion


    /**
     * 发送验证码
     *
     * @param isPhone       true表示手机号,否则是邮箱
     * @param account       账号 (手机或者邮箱)
@@ -183,45 +373,6 @@


    }

    /**
     * 刷新Token(B端账号)
     *
     * @param account       手机或者邮箱
     * @param loginPwd      密码
     * @param cloudCallBeak -
     */
    public void refreshToken(String account, String loginPwd, CloudCallBeak<HDLLoginBean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Login;
        JsonObject json = new JsonObject();
        json.addProperty("grantType", "refresh_token");
//        json.addProperty("refreshToken", UserConfigManage.getInstance().getRefreshToken());
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
                Gson gson = new Gson();
                HDLLoginBean loginBean = gson.fromJson(jsonStr, HDLLoginBean.class);
//                    saveUserData(loginBean);
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(loginBean);
                }
            }

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


    // endregion

    // region --------【C端账号】---------

    // endregion

    /**
     * 退出登录时调用，清除推送数据