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 | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 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 0d589c2..0fb0d86 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -4,15 +4,15 @@
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.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.bean.BaseEventBus;
import com.hdl.photovoltaic.bean.ModBusBean;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
@@ -100,11 +100,10 @@
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
//娣诲姞璁惧鍒颁簯绔�
String mac = getKeyValue("mac", getKeyValue("data", data));
-
- HdlDeviceLogic.getInstance().steGatewayParam(mac, new CloudCallBeak<Boolean>() {
+ HdlDeviceLogic.getInstance().setGatewayRemoteParam(mac, new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- HdlDeviceLogic.getInstance().editGatewayParam(mac, new CloudCallBeak<Boolean>() {
+ HdlDeviceLogic.getInstance().editGatewayParam(mac, new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
@@ -124,22 +123,22 @@
}
@Override
- public void onFailure(Exception exception) {
- uniCallbackData(null, -100, exception.getMessage(), callback);
+ public void onFailure(HDLException e) {
+ uniCallbackData(null, -100, e.getMessage(), callback);
}
});
}
@Override
- public void onFailure(Exception exception) {
- uniCallbackData(null, -100, exception.getMessage(), callback);
+ public void onError(HDLLinkException e) {
+ uniCallbackData(null, -100, e.getMessage(), callback);
}
});
}
@Override
- public void onFailure(Exception exception) {
- uniCallbackData(null, -100, exception.getMessage(), callback);
+ public void onError(HDLLinkException e) {
+ uniCallbackData(null, -100, e.getMessage(), callback);
}
});
@@ -163,22 +162,22 @@
}
break;
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
- //
- HdlResidenceLogic.getInstance().getGatewayList(new CloudCallBeak<Boolean>() {
+ //鑾峰彇缃戝叧璁惧鍒楄〃
+ HdlDeviceLogic.getInstance().getLocalGatewayList(new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
-
if (callback != null) {
- uniCallbackData(HDLLinkLocalGateway.getInstance().getGatewayList(), callback);
+ uniCallbackData(HdlDeviceLogic.getInstance().getGatewayList(), callback);
}
}
@Override
- public void onFailure(Exception exception) {
- uniCallbackData(null, -2, exception.getMessage(), callback);
+ public void onFailure(HDLException e) {
+ if (callback != null) {
+ uniCallbackData(null, -2, e.getMessage(), callback);
+ }
}
});
-
}
break;
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
@@ -190,7 +189,7 @@
//娣诲姞璁惧鍒颁簯绔�
String mac = getKeyValue("mac", getKeyValue("data", data));
//鑾峰彇oid鍒楄〃
- HdlDeviceLogic.getInstance().getGatewayOidList(mac, new CloudCallBeak<List<OidBean>>() {
+ HdlDeviceLogic.getInstance().getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
@Override
public void onSuccess(List<OidBean> list) {
if (callback != null) {
@@ -199,7 +198,7 @@
}
@Override
- public void onFailure(Exception e) {
+ public void onError(HDLLinkException e) {
uniCallbackData(null, -2, e.getMessage(), callback);
}
});
@@ -255,17 +254,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