From e1e6413cdf1c490b0309611ef0ea2a3c4c54f7ec Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 17 六月 2024 19:27:16 +0800
Subject: [PATCH] 2024年06月17日19:27:09
---
app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java | 93 ------------------
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 3
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 94 ++++++++++++++++++
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 96 +++++++++++++++++-
4 files changed, 186 insertions(+), 100 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 fc0abf9..76c4b49 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java
@@ -261,69 +261,7 @@
}
- /**
- * 鑾峰彇鐢电珯浜や粯浜岀淮鐮侊紙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);
- }
- }
- });
-
- }
/**
* 鑾峰彇鎴愬憳鍒楄〃锛圕绔級
@@ -461,38 +399,7 @@
}
- /**
- * 鐢电珯鎺堟潈瀹夎鍟嗭紙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
- public void onSuccess(String jsonStr) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
- }
- }
-
- @Override
- public void onFailure(HDLException e) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
- }
- }
- });
-
- }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
index 3e61f84..8884190 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -918,7 +918,101 @@
});
}
+ /**
+ * 鐢电珯鎺堟潈瀹夎鍟嗭紙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
+ public void onSuccess(String jsonStr) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+ }
+ /**
+ * 鑾峰彇鐢电珯浜や粯浜岀淮鐮侊紙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);
+ }
+ }
+ });
+
+ }
/**
* 娣诲姞鎺ㄩ�乀oken
*
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 89379c6..ae214d1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -199,6 +199,24 @@
EventBus.getDefault().post(baseEventBus);
}
break;
+ //鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+ case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
+ uniGetDeliveryUrlQrcode(type, data, callback);
+
+ }
+ break;
+ //鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
+ case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT: {
+ uniGetDeliverToAccount(type, data, callback);
+
+ }
+ break;
+ //鐢电珯鎺堟潈瀹夎鍟�(C绔�)
+ case HDLUniMP.UNI_EVENT_REPLY_HOME_UPDATEDEBUGPERM: {
+ uniHomeUpdateDebugPerm(type, data, callback);
+
+ }
+ break;
}
if (callback != null) {
@@ -627,6 +645,68 @@
//region ******uni鎺ュ彛鏂规硶******
/**
+ * 鐢电珯鎺堟潈瀹夎鍟�(C绔�)
+ */
+ private void uniHomeUpdateDebugPerm(String type, Object data, DCUniMPJSCallback callback) {
+
+
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ boolean debugPerm = Boolean.parseBoolean(getKeyValue("debugPerm", getKeyValue("data", data)));
+ HdlResidenceLogic.getInstance().homeUpdateDebugPerm(homeId, debugPerm, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(type, e, callback);
+ }
+ });
+
+ }
+
+ /**
+ * 鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
+ */
+ private void uniGetDeliverToAccount(String type, Object data, DCUniMPJSCallback callback) {
+
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ String account = getKeyValue("account", getKeyValue("data", data));
+ HdlResidenceLogic.getInstance().getDeliverToAccount(homeId, account, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(type, e, callback);
+ }
+ });
+
+ }
+
+ /**
+ * 鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+ */
+ private void uniGetDeliveryUrlQrcode(String type, Object data, DCUniMPJSCallback callback) {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ HdlResidenceLogic.getInstance().getDeliveryUrlQrcode(homeId, new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(type, e, callback);
+ }
+ });
+
+ }
+
+ /**
* 鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
*/
private void uniGetUserRightType(String type, Object data, DCUniMPJSCallback callback) {
@@ -648,7 +728,7 @@
*/
private void uniGetStaffEdit(String type, Object data, DCUniMPJSCallback callback) {
StaffBean staffBean = new StaffBean();
- String member_info = getKeyValue("staff_info", getKeyValue("data", data));
+ String member_info = getKeyValue("staffInfo", getKeyValue("data", data));
if (!TextUtils.isEmpty(member_info)) {
try {
staffBean = new Gson().fromJson(member_info, StaffBean.class);
@@ -673,7 +753,7 @@
*/
private void uniGetStaffDelete(String type, Object data, DCUniMPJSCallback callback) {
StaffBean staffBean = new StaffBean();
- String member_info = getKeyValue("staff_info", getKeyValue("data", data));
+ String member_info = getKeyValue("staffInfo", getKeyValue("data", data));
if (!TextUtils.isEmpty(member_info)) {
try {
staffBean = new Gson().fromJson(member_info, StaffBean.class);
@@ -698,7 +778,7 @@
*/
private void uniGetStaffAdd(String type, Object data, DCUniMPJSCallback callback) {
StaffBean staffBean = new StaffBean();
- String member_info = getKeyValue("staff_info", getKeyValue("data", data));
+ String member_info = getKeyValue("staffInfo", getKeyValue("data", data));
if (!TextUtils.isEmpty(member_info)) {
try {
staffBean = new Gson().fromJson(member_info, StaffBean.class);
@@ -722,7 +802,9 @@
* 鑾峰彇鍛樺伐鍒楄〃
*/
private void uniGetStaffList(String type, Object data, DCUniMPJSCallback callback) {
- HdlMemberLogic.getInstance().getStaffList(1, 50, new CloudCallBeak<PageNumberObject<List<StaffBean>>>() {
+ long pageNo = Long.parseLong(getKeyValue("pageNo", getKeyValue("data", data)));
+ long pageSize = Long.parseLong(getKeyValue("pageSize", getKeyValue("data", data)));
+ HdlMemberLogic.getInstance().getStaffList(pageNo, pageSize, new CloudCallBeak<PageNumberObject<List<StaffBean>>>() {
@Override
public void onSuccess(PageNumberObject<List<StaffBean>> obj) {
uniSuccessCallback(type, obj.getList(), callback);
@@ -740,7 +822,7 @@
*/
private void uniGetMemberEdit(String type, Object data, DCUniMPJSCallback callback) {
MemberBean memberBean = new MemberBean();
- String member_info = getKeyValue("member_info", getKeyValue("data", data));
+ String member_info = getKeyValue("memberInfo", getKeyValue("data", data));
if (!TextUtils.isEmpty(member_info)) {
try {
memberBean = new Gson().fromJson(member_info, MemberBean.class);
@@ -765,7 +847,7 @@
*/
private void uniGetMemberDelete(String type, Object data, DCUniMPJSCallback callback) {
MemberBean memberBean = new MemberBean();
- String member_info = getKeyValue("member_info", getKeyValue("data", data));
+ String member_info = getKeyValue("memberInfo", getKeyValue("data", data));
if (!TextUtils.isEmpty(member_info)) {
try {
memberBean = new Gson().fromJson(member_info, MemberBean.class);
@@ -790,7 +872,7 @@
*/
private void uniGetMemberAdd(String type, Object data, DCUniMPJSCallback callback) {
MemberBean memberBean = new MemberBean();
- String member_info = getKeyValue("member_info", getKeyValue("data", data));
+ String member_info = getKeyValue("memberInfo", getKeyValue("data", data));
if (!TextUtils.isEmpty(member_info)) {
try {
memberBean = new Gson().fromJson(member_info, MemberBean.class);
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index 7083d8c..3be4c19 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -31,6 +31,9 @@
public final static String UNI_EVENT_REPLY_HOME_EDIT = "edit";//浣忓畢銆愮數绔欍�戠紪杈�
public final static String UNI_EVENT_REPLY_HOME_DETAILS = "details";//浣忓畢銆愮數绔欍�戣鎯�
public final static String UNI_EVENT_REPLY_HOME_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
+ public final static String UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE= "delivery_url_qrcode";//鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+ public final static String UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT= "deliver_to_account";//鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
+ public final static String UNI_EVENT_REPLY_HOME_UPDATEDEBUGPERM= "update_debug_perm";//鐢电珯鎺堟潈瀹夎鍟�(C绔�)
public final static String UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE = "close_home_details_page";//鍏抽棴璇︽儏椤�
/*********璁惧妯″潡*********/
--
Gitblit v1.8.0