From 6d10962d2abdd39a8e1b28ee430d8a85274aa677 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期日, 08 十月 2023 13:17:19 +0800
Subject: [PATCH] 2023年10月08日13:17:17
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 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 f297b49..1293962 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -6,7 +6,6 @@
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
-import com.google.gson.JsonObject;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.bean.BaseEventBus;
import com.hdl.photovoltaic.bean.ModBusBean;
@@ -83,6 +82,7 @@
//EventBus浜嬩欢鍒嗗彂
BaseEventBus baseEventBus = new BaseEventBus();
baseEventBus.setType(ConstantManage.EVENTBUS_POST_HOME_CREATED);
+ baseEventBus.setData(getKeyValue("data", data));
EventBus.getDefault().post(baseEventBus);
}
break;
@@ -205,6 +205,43 @@
});
}
break;
+ //璁惧鏃堕棿璇诲彇
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME: {
+ //娣诲姞璁惧鍒颁簯绔�
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ //鑾峰彇oid鍒楄〃
+ HdlDeviceLogic.getInstance().getGatewayTime(mac, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+
+ }
+ });
+ }
+ //璁惧鏃堕棿缂栬緫
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME_EDIT: {
+ //娣诲姞璁惧鍒颁簯绔�
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ //鑾峰彇oid鍒楄〃
+ HdlDeviceLogic.getInstance().getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
+ @Override
+ public void onSuccess(List<OidBean> obj) {
+
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+
+ }
+ });
+ }
+ break;
+
}
} else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
@@ -255,17 +292,17 @@
// 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("0101050217BBC400");
- }
- 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(int[] data) {
Log.d("data", Arrays.toString(data));
--
Gitblit v1.8.0