From 116def783f85af5896fc4500bc8a690d8b1eb5f3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 23 九月 2023 14:46:27 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into wjc

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 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 5837237..0fb0d86 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -2,6 +2,7 @@
 
 
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.google.gson.Gson;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -28,6 +29,7 @@
 import org.json.JSONObject;
 
 
+import java.util.Arrays;
 import java.util.List;
 
 import io.dcloud.feature.unimp.DCUniMPJSCallback;
@@ -98,7 +100,7 @@
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
                         //娣诲姞璁惧鍒颁簯绔�
                         String mac = getKeyValue("mac", getKeyValue("data", data));
-                        HdlDeviceLogic.getInstance().steGatewayParam(mac, new LinkCallBack<Boolean>() {
+                        HdlDeviceLogic.getInstance().setGatewayRemoteParam(mac, new LinkCallBack<Boolean>() {
                             @Override
                             public void onSuccess(Boolean obj) {
                                 HdlDeviceLogic.getInstance().editGatewayParam(mac, new LinkCallBack<Boolean>() {
@@ -165,7 +167,7 @@
                             @Override
                             public void onSuccess(Boolean obj) {
                                 if (callback != null) {
-                                    uniCallbackData(HDLLinkLocalGateway.getInstance().getGatewayList(), callback);
+                                    uniCallbackData(HdlDeviceLogic.getInstance().getGatewayList(), callback);
                                 }
                             }
 
@@ -182,6 +184,7 @@
                         sendModBus(data, callback);
 
                     }
+                    break;
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {
                         //娣诲姞璁惧鍒颁簯绔�
                         String mac = getKeyValue("mac", getKeyValue("data", data));
@@ -200,6 +203,7 @@
                             }
                         });
                     }
+                    break;
                 }
 
             } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
@@ -250,19 +254,20 @@
 //        ModBusBean modBusBean = new ModBusBean();
 //        modBusBean.setOid("0101050219D44A00");
 //        modBusBean.setData(new byte[]{00,01,00,00,00,0x09,00,00,00,01,03,00,00,00,01});
-        if (TextUtils.isEmpty(modBusBean.getOid())) {
-            modBusBean.setOid("010105021775E400");
-        }
-        if (modBusBean.getOid() == null || modBusBean.getData() == null) {
-            HdlLogLogic.print("鍐呭涓虹┖,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
+//        if (TextUtils.isEmpty(modBusBean.getOid())) {
+//            modBusBean.setOid("0101050217BBC400");
+//        }
+        if (modBusBean.getMac() == null || modBusBean.getData() == null) {
+            HdlLogLogic.print("鍐呭涓虹┖,oid=" + modBusBean.getMac() + " data=" + modBusBean.getData());
             return;
         }
 
 
         //鍙戦�乵odbus鍗忚
-        HDLModBusConnect.getInstance().Send(modBusBean.getOid(), modBusBean.getData(), new ModbusCallBack() {
+        HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
             @Override
-            public void onSuccess(byte[] data) {
+            public void onSuccess(int[] data) {
+                Log.d("data", Arrays.toString(data));
                 uniCallbackData(data, callback);
             }
 
@@ -355,6 +360,8 @@
             uniCallBackBaseBean.setData(obj);
             if (callback != null) {
                 callback.invoke(getJSONObject(uniCallBackBaseBean));
+//                callback.invoke(uniCallBackBaseBean);
+
             }
         } catch (Exception e) {
             HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�", e.getMessage());

--
Gitblit v1.8.0