From f21dcea3e5f6fc7bfc51b3ddc6ff9764fb93bfdb Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 11 十二月 2024 11:25:37 +0800
Subject: [PATCH] 2024年12月11日11:25:28

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 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 9316532..1d0295e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -244,16 +244,15 @@
                         }
                     }
                     break;
-                    //鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
-                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
-                        uniGetDeliveryUrlQrcode(type, data, callback);
-                    }
-                    break;
+//                    //鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+//                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
+//                        uniGetDeliveryUrlQrcode(type, data, callback);
+//                    }
+//                    break;
                     //鐢电珯鐨勪氦浠楿RL(瀹夎鍟�)
-                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURL: {
+                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
                         uniGetDeliveryUrl(type, data, callback);
                     }
-
                     break;
                     //鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
                     case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT: {
@@ -996,7 +995,14 @@
         HdlResidenceLogic.getInstance().getDeliveryUrl(homeId, new CloudCallBeak<String>() {
             @Override
             public void onSuccess(String obj) {
-                uniSuccessCallback(type, obj, callback);
+                try {
+                    Gson g = new Gson();
+                    JsonObject jObject = g.fromJson(obj, JsonObject.class);
+                    String deliveryUrl = jObject.get("deliveryUrl").toString();
+                    uniSuccessCallback(type, deliveryUrl, callback);
+                } catch (Exception ignored) {
+                    uniSuccessCallback(type, obj, callback);
+                }
             }
 
             @Override

--
Gitblit v1.8.0