From f9bcd06ca4805151508716dc6afc0ccf1520e3d9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 04 十二月 2024 17:06:30 +0800
Subject: [PATCH] 2024年12月04日17:06:28
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
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 3c96a8f..9316532 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -249,6 +249,12 @@
uniGetDeliveryUrlQrcode(type, data, callback);
}
break;
+ //鐢电珯鐨勪氦浠楿RL(瀹夎鍟�)
+ case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURL: {
+ uniGetDeliveryUrl(type, data, callback);
+ }
+
+ break;
//鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT: {
uniGetDeliverToAccount(type, data, callback);
@@ -724,11 +730,15 @@
String s = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(url, deviceModel);
//鏈湴缂撳瓨鏁版嵁
if (callback != null) {
- if (s.startsWith("{")) {
- uniSuccessCallback(type, new Gson().fromJson(s, JsonObject.class), callback);
- } else if (s.startsWith("[")) {
- uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
- } else {
+ try {
+ if (s.startsWith("{")) {
+ uniSuccessCallback(type, new Gson().fromJson(s, JsonObject.class), callback);
+ } else if (s.startsWith("[")) {
+ uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
+ } else {
+ uniSuccessCallback(type, s, callback);
+ }
+ } catch (Exception e) {
uniSuccessCallback(type, s, callback);
}
}
@@ -744,11 +754,15 @@
} else {
//鏈湴缂撳瓨鏁版嵁
if (callback != null) {
- if (json.startsWith("{")) {
- uniSuccessCallback(type, new Gson().fromJson(json, JsonObject.class), callback);
- } else if (json.startsWith("[")) {
- uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
- } else {
+ try {
+ if (json.startsWith("{")) {
+ uniSuccessCallback(type, new Gson().fromJson(json, JsonObject.class), callback);
+ } else if (json.startsWith("[")) {
+ uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
+ } else {
+ uniSuccessCallback(type, json, callback);
+ }
+ } catch (Exception e) {
uniSuccessCallback(type, json, callback);
}
}
@@ -975,6 +989,25 @@
}
/**
+ * 鐢电珯鐨勪氦浠楿Rl(瀹夎鍟�)
+ */
+ private void uniGetDeliveryUrl(String type, Object data, DCUniMPJSCallback callback) {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ HdlResidenceLogic.getInstance().getDeliveryUrl(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) {
--
Gitblit v1.8.0