2023年12月27日19:25:46

mac

2023-12-27 5df76d441a853b1a5d2dff018c01327eb3a717b3

 HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/controller/HDLPMUserController.java

@@ -60,8 +60,14 @@
     * @param callBack
     * @return https://nearest.hdlcontrol.com/smart-footstone/region/regionByUserAccount
     */
    public Disposable regionByAccount(String account, IRegionByAccountCallBack callBack) {
    public Disposable regionByAccount(boolean isBooleanB, String account, IRegionByAccountCallBack callBack) {


        String requestUrl = HDLLinkPMSdk.getInitUrl() + HDLCloudUserApi.POST_RegionByAccount;
        if (!isBooleanB) {
            requestUrl = HDLLinkPMSdk.getInitUrl() + HDLCloudUserApi.C_POST_RegionByAccount;
        }
        String finalRequestUrl = requestUrl;
        return HxHttp.builder()
                .url(requestUrl)
                .params("account", account)
@@ -77,7 +83,7 @@

                    @Override
                    public void onFailure(HDLException e) {
                        HDLExceptionSubmitUtils.submit(requestUrl, account, e);
                        HDLExceptionSubmitUtils.submit(finalRequestUrl, account, e);
                        if (callBack != null) {
                            callBack.onFailure(e);
                        }
@@ -90,19 +96,24 @@
     * 登录
     * 通过账号和密码
     *
     * @param account  手机或者邮箱
     * @param loginPwd 密码
     * @param callBack 回调
     * @param isBooleanB true=B,false=C
     * @param account    手机或者邮箱
     * @param loginPwd   密码
     * @param callBack   回调
     * @return -
     */
    public Disposable loginByPassword(String account, String loginPwd, ILoginCallBack callBack) {
    public Disposable loginByPassword(boolean isBooleanB, String account, String loginPwd, ILoginCallBack callBack) {
        String requestUrl = HDLCloudUserApi.getRequestUrl(HDLCloudUserApi.POST_LOGIN);
        if (!isBooleanB) {
            requestUrl = HDLCloudUserApi.getRequestUrl(HDLCloudUserApi.C_POST_LOGIN);
        }
        JsonObject json = new JsonObject();
        json.addProperty("account", account);
        json.addProperty("loginPwd", loginPwd);
//        json.addProperty("platform", "APP");
        json.addProperty("grantType", "password");

        String finalRequestUrl = requestUrl;
        return HxHttp.builder()
                .url(requestUrl)
                .raw(json.toString())
@@ -118,7 +129,7 @@

                    @Override
                    public void onFailure(HDLException e) {
                        HDLExceptionSubmitUtils.submit(requestUrl, json, e);
                        HDLExceptionSubmitUtils.submit(finalRequestUrl, json, e);
                        if (callBack != null) {
                            callBack.onFailure(e);
                        }