From 5df76d441a853b1a5d2dff018c01327eb3a717b3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 27 十二月 2023 19:25:57 +0800
Subject: [PATCH] 2023年12月27日19:25:46
---
HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/controller/HDLPMUserController.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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..145edb3 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
@@ -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);
}
--
Gitblit v1.8.0