From 0a18a8180bc6040c941b07df1be1f7b726b4c155 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 21 八月 2023 14:19:26 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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 2e8325e..f297b49 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -2,14 +2,18 @@
import android.text.TextUtils;
+import android.util.Log;
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;
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;
@@ -26,6 +30,7 @@
import org.json.JSONObject;
+import java.util.Arrays;
import java.util.List;
import io.dcloud.feature.unimp.DCUniMPJSCallback;
@@ -96,10 +101,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);
@@ -119,22 +124,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,14 +168,14 @@
@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) {
+ public void onFailure(HDLException e) {
if (callback != null) {
- uniCallbackData(null, -2, exception.getMessage(), callback);
+ uniCallbackData(null, -2, e.getMessage(), callback);
}
}
});
@@ -180,11 +185,12 @@
sendModBus(data, callback);
}
+ break;
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {
//娣诲姞璁惧鍒颁簯绔�
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) {
@@ -193,11 +199,12 @@
}
@Override
- public void onFailure(Exception e) {
+ public void onError(HDLLinkException e) {
uniCallbackData(null, -2, e.getMessage(), callback);
}
});
}
+ break;
}
} else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
@@ -249,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());
@@ -260,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);
}
@@ -353,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