From b93ca15aa55af7cf2dee653beb100076c897f152 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 16:56:38 +0800
Subject: [PATCH] 2024年06月25日16:56:31
---
app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java | 127 +++++-------------------------------------
1 files changed, 15 insertions(+), 112 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java
index 67ea58a..5aca561 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java
@@ -46,7 +46,7 @@
*
* @param cloudCallBeak -
*/
- public void getUserRightType(CloudCallBeak<PageNumberObject<UserRightTypeBean>> cloudCallBeak) {
+ public void getUserRightType(CloudCallBeak<UserRightTypeBean> cloudCallBeak) {
String requestUrl = HttpApi.B_POST_GET_USERRIGHTTYPE;
JsonObject json = new JsonObject();
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -54,15 +54,14 @@
public void onSuccess(String jsonStr) {
if (TextUtils.isEmpty(jsonStr)) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(new PageNumberObject<>());
+ cloudCallBeak.onSuccess(new UserRightTypeBean());
}
}
Gson gson = new Gson();
- Type type = new TypeToken<PageNumberObject<UserRightTypeBean>>() {
- }.getType();
- PageNumberObject<UserRightTypeBean> pageNumberObject = gson.fromJson(jsonStr, type);
+
+ UserRightTypeBean userRightTypeBean = gson.fromJson(jsonStr, UserRightTypeBean.class);
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(pageNumberObject);
+ cloudCallBeak.onSuccess(userRightTypeBean);
}
}
@@ -83,11 +82,11 @@
* @param pageSize 椤垫暟锛堜竴椤靛灏戞暟鎹級
* @param cloudCallBeak -
*/
- public void getStaffList(long pageNo, long pageSize, CloudCallBeak<PageNumberObject<List<StaffBean>>> cloudCallBeak) {
+ public void getStaffList(long pageNo, long pageSize, CloudCallBeak<PageNumberObject<StaffBean>> cloudCallBeak) {
String requestUrl = HttpApi.B_POST_GET_LISTBYPAGE;
JsonObject json = new JsonObject();
json.addProperty("pageNo", pageNo);
- json.addProperty("pageSize", pageNo);
+ json.addProperty("pageSize", pageSize);
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String jsonStr) {
@@ -97,9 +96,9 @@
}
}
Gson gson = new Gson();
- Type type = new TypeToken<PageNumberObject<List<StaffBean>>>() {
+ Type type = new TypeToken<PageNumberObject<StaffBean>>() {
}.getType();
- PageNumberObject<List<StaffBean>> pageNumberObject = gson.fromJson(jsonStr, type);
+ PageNumberObject<StaffBean> pageNumberObject = gson.fromJson(jsonStr, type);
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(pageNumberObject);
}
@@ -121,7 +120,7 @@
* @param userId -
* @param cloudCallBeak -
*/
- public void getStaffInfo(String userId, CloudCallBeak<PageNumberObject<StaffBean>> cloudCallBeak) {
+ public void getStaffInfo(String userId, CloudCallBeak<StaffBean> cloudCallBeak) {
String requestUrl = HttpApi.B_POST_GET_MANAGE_INFO;
JsonObject json = new JsonObject();
json.addProperty("userId", userId);
@@ -130,15 +129,14 @@
public void onSuccess(String jsonStr) {
if (TextUtils.isEmpty(jsonStr)) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(new PageNumberObject<>());
+ cloudCallBeak.onSuccess(new StaffBean());
}
}
Gson gson = new Gson();
- Type type = new TypeToken<PageNumberObject<StaffBean>>() {
- }.getType();
- PageNumberObject<StaffBean> pageNumberObject = gson.fromJson(jsonStr, type);
+
+ StaffBean staffBean = gson.fromJson(jsonStr, StaffBean.class);
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(pageNumberObject);
+ cloudCallBeak.onSuccess(staffBean);
}
}
@@ -262,69 +260,6 @@
}
- /**
- * 鑾峰彇鐢电珯浜や粯浜岀淮鐮侊紙B绔級
- * 鎻忚堪锛氬畨瑁呭晢鐢电珯鐨勪氦浠樹簩缁寸爜
- *
- * @param homeId 鐢电珯id
- * @param cloudCallBeak -
- */
- public void getDeliveryUrlQrcode(String homeId, CloudCallBeak<String> cloudCallBeak) {
- String requestUrl = HttpApi.POST_getDeliveryUrlQrcode;
- JsonObject json = new JsonObject();
- json.addProperty("homeId", homeId);
-// json.addProperty("zoneType", memberBean.getId());//鍖哄煙
-
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
- @Override
- public void onSuccess(String jsonStr) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(jsonStr);
- }
- }
-
- @Override
- public void onFailure(HDLException e) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
- }
- }
- });
-
- }
-
- /**
- * 鐢电珯鎵嬪姩浜や粯(B绔�)
- * 鎻忚堪锛氬畨瑁呭晢鎵嬪姩浜や粯鐢电珯缁欐寚瀹氱殑C绔处鍙�
- *
- * @param homeId 鐢电珯id
- * @param account C绔处鍙�
- * @param cloudCallBeak -
- */
- public void getDeliverToAccount(String homeId, String account, CloudCallBeak<Boolean> cloudCallBeak) {
- String requestUrl = HttpApi.POST_deliverToAccount;
- JsonObject json = new JsonObject();
- json.addProperty("homeId", homeId);
- json.addProperty("account", account);//C绔处鍙�
-// json.addProperty("zoneType", memberBean.getId());//鍖哄煙
-
- 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);
- }
- }
- });
-
- }
/**
* 鑾峰彇鎴愬憳鍒楄〃锛圕绔級
@@ -363,6 +298,7 @@
});
}
+
/**
* 娣诲姞鎴愬憳锛圕绔級
@@ -443,39 +379,6 @@
json.addProperty("homeId", memberBean.getHomeId());
json.addProperty("childAccountId", memberBean.getChildAccountId());
json.addProperty("childId", memberBean.getId());//鏌ユ壘瀛愯处鍙锋帴鍙ｈ幏鍙栧埌鐨勬暟鎹紙涓婚敭id==childId锛�
-
- 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);
- }
- }
- });
-
- }
-
- /**
- * 鐢电珯鎺堟潈瀹夎鍟嗭紙C绔級
- * 鎻忚堪锛氫氦浠樺悗鐨勪綇瀹咃紝C绔敤鎴峰彲浠ュ紑鍚巿鏉冨悗瀹夎鍟嗗彲浠ョ户缁皟璇曠數绔�
- *
- * @param homeId 鐢电珯id
- * @param debugPerm 鎺堟潈鐘舵�侊紙true鍙互缁х画璋冭瘯锛�
- * @param cloudCallBeak -
- */
- public void homeUpdateDebugPerm(String homeId, boolean debugPerm, CloudCallBeak<Boolean> cloudCallBeak) {
- String requestUrl = HttpApi.C_POST_HOME_UPDATEDEBUGPERM;
- JsonObject json = new JsonObject();
- json.addProperty("homeId", homeId);
- json.addProperty("debugPerm", debugPerm);
-// json.addProperty("zoneType", memberBean.getId());//鍖哄煙
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
--
Gitblit v1.8.0