From bd80ca98ffb4f483ca2eba47051281fa69e790ac Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 14 八月 2023 10:24:25 +0800
Subject: [PATCH] 代码同步
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 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 f3845f7..0d589c2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -2,9 +2,11 @@
import android.text.TextUtils;
+import android.util.Log;
import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
+import com.google.gson.JsonObject;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.bean.BaseEventBus;
import com.hdl.photovoltaic.bean.ModBusBean;
@@ -27,6 +29,7 @@
import org.json.JSONObject;
+import java.util.Arrays;
import java.util.List;
import io.dcloud.feature.unimp.DCUniMPJSCallback;
@@ -143,7 +146,7 @@
}
break;
- case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_NET_LIST: {
//缃戝叧鎼滅储
HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
@Override
@@ -159,10 +162,30 @@
});
}
break;
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
+ //
+ HdlResidenceLogic.getInstance().getGatewayList(new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+
+ if (callback != null) {
+ uniCallbackData(HDLLinkLocalGateway.getInstance().getGatewayList(), callback);
+ }
+ }
+
+ @Override
+ public void onFailure(Exception exception) {
+ uniCallbackData(null, -2, exception.getMessage(), callback);
+ }
+ });
+
+ }
+ break;
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
sendModBus(data, callback);
}
+ break;
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {
//娣诲姞璁惧鍒颁簯绔�
String mac = getKeyValue("mac", getKeyValue("data", data));
@@ -181,6 +204,7 @@
}
});
}
+ break;
}
} else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
@@ -232,7 +256,7 @@
// 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");
+ modBusBean.setOid("0101050217BBC400");
}
if (modBusBean.getOid() == null || modBusBean.getData() == null) {
HdlLogLogic.print("鍐呭涓虹┖,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
@@ -243,7 +267,8 @@
//鍙戦�乵odbus鍗忚
HDLModBusConnect.getInstance().Send(modBusBean.getOid(), modBusBean.getData(), new ModbusCallBack() {
@Override
- public void onSuccess(byte[] data) {
+ public void onSuccess(int[] data) {
+ Log.d("data", Arrays.toString(data));
uniCallbackData(data, callback);
}
@@ -336,6 +361,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