From a6c0ac0f20d1d91fbe1fe591a6a9ca46f82399f5 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 23 二月 2024 16:37:16 +0800
Subject: [PATCH] 使用新的依赖库的名称

---
 HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/controller/HDLPMUserController.java |   92 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/controller/HDLPMUserController.java b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/controller/HDLPMUserController.java
index a992e07..b5502d4 100644
--- a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/controller/HDLPMUserController.java
+++ b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/controller/HDLPMUserController.java
@@ -58,7 +58,7 @@
      *
      * @param account
      * @param callBack
-     * @return https://nearest.hdlcontrol.com/smart-footstone/region/regionByUserAccount
+     * @return https://nearest.hdlchina.com/smart-footstone/region/regionByUserAccount
      */
     public Disposable regionByAccount(String account, IRegionByAccountCallBack callBack) {
         String requestUrl = HDLLinkPMSdk.getInitUrl() + HDLCloudUserApi.POST_RegionByAccount;
@@ -92,8 +92,8 @@
      *
      * @param account  鎵嬫満鎴栬�呴偖绠�
      * @param loginPwd 瀵嗙爜
-     * @param callBack 鍥炶皟
-     * @return -
+     * @param callBack
+     * @return
      */
     public Disposable loginByPassword(String account, String loginPwd, ILoginCallBack callBack) {
         String requestUrl = HDLCloudUserApi.getRequestUrl(HDLCloudUserApi.POST_LOGIN);
@@ -128,6 +128,92 @@
     }
 
     /**
+     * 鑾峰彇璐﹀彿鎵�鍦ㄥ尯鍩�
+     *
+     * @param account
+     * @param callBack
+     * @return https://nearest.hdlcontrol.com/smart-footstone/region/regionByUserAccount
+     */
+    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)
+                .build()
+                .post()
+                .subscribeWith(new HDLResponse<HDLUserRegionBean>() {
+                    @Override
+                    public void onResponse(HDLUserRegionBean response) {
+                        if (callBack != null) {
+                            callBack.onSuccess(response);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        HDLExceptionSubmitUtils.submit(finalRequestUrl, account, e);
+                        if (callBack != null) {
+                            callBack.onFailure(e);
+                        }
+                    }
+                });
+
+    }
+
+    /**
+     * 鐧诲綍
+     * 閫氳繃璐﹀彿鍜屽瘑鐮�
+     *
+     * @param isBooleanB true=B,false=C
+     * @param account    鎵嬫満鎴栬�呴偖绠�
+     * @param loginPwd   瀵嗙爜
+     * @param callBack   鍥炶皟
+     * @return -
+     */
+    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())
+                .build()
+                .post()
+                .subscribeWith(new HDLResponse<HDLLoginBean>() {
+                    @Override
+                    public void onResponse(HDLLoginBean response) {
+                        if (callBack != null) {
+                            callBack.onSuccess(response);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        HDLExceptionSubmitUtils.submit(finalRequestUrl, json, e);
+                        if (callBack != null) {
+                            callBack.onFailure(e);
+                        }
+                    }
+                });
+
+    }
+
+
+    /**
      * 鐧诲綍
      * 閫氳繃楠岃瘉鐮�
      *

--
Gitblit v1.8.0