From c7eeb5c6bc5d1cba44e92761d4be67f97f7c23aa Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 05 六月 2024 16:38:30 +0800
Subject: [PATCH] 2024年06月05日16:38:23

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 00ef4a5..a338f13 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -534,6 +534,12 @@
         HdlLogLogic.print("uni---缁勮uni鍙戦�佹暟鎹牸寮�---" + json, false);
     }
 
+    public void openUniMPDelay(String path, JSONObject jsonObject) {
+        JSONObject json = this.createdJSONObject(jsonObject, true);
+        HDLUniMPSDKManager.getInstance().openUniMPDelay(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
+        HdlLogLogic.print("uni---缁勮uni鍙戦�佹暟鎹牸寮�---" + json, false);
+    }
+
     /**
      * 鍘熺敓銆愪富鍔ㄣ�戝悜灏忕▼搴忓彂閫侀�氱煡浜嬩欢
      * 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
@@ -796,7 +802,7 @@
         String module = "FW#" + imageId;//妯″潡淇℃伅(HW锛氱‖浠�)
 
         //鍗囩骇鏈湴浼樺厛->浜戠鍗囩骇
-        HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
+        HdlDeviceLogic.getInstance().isLocalConnect(homeId,deviceMac, new CloudCallBeak<Boolean>() {
             @Override
             public void onSuccess(Boolean b) {
                 if (b) {
@@ -1048,7 +1054,7 @@
         String imageId = getKeyValue("imageId", getKeyValue("data", data));//鍥轰欢闀滃儚id
         String module = driverCode + "#" + imageId;
         //鍗囩骇鏈湴浼樺厛->浜戠鍗囩骇
-        HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
+        HdlDeviceLogic.getInstance().isLocalConnect(homeId,deviceMac, new CloudCallBeak<Boolean>() {
             @Override
             public void onSuccess(Boolean b) {
                 if (b) {
@@ -1493,7 +1499,7 @@
 //        com.alibaba.fastjson.JSONArray jsonArray = JSON.parseArray(data);
         try {
             String devices = getKeyValue("devices", getKeyValue("data", data));
-            String homeId = UserConfigManage.getInstance().getHomeId(); //uni鍒涘缓鐢电珯鎴愬姛涔嬪悗閫氱煡缁橝ndroid鐨�
+            String homeId = getKeyValue("homeId", getKeyValue("data", data));
             Gson gson = new Gson();
             Type typeOfT = new TypeToken<List<GatewayBean>>() {
             }.getType();

--
Gitblit v1.8.0