From ebf1b9c813030a366bdc8967d2788eba3f3d9b5a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 21 八月 2023 13:18:58 +0800
Subject: [PATCH] 2023年08月21日13:18:56
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 86 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 20 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 0cc1d91..46d5c9e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -1,25 +1,23 @@
package com.hdl.photovoltaic.other;
-import android.content.Intent;
import android.text.TextUtils;
-import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
+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.ui.bean.HouseIdBean;
+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;
-import com.hdl.photovoltaic.uni.UniToAndroidBean;
import com.hdl.photovoltaic.utils.WifiUtils;
import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
-import com.hdl.sdk.link.common.utils.LogUtils;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.callback.GatewayCallBack;
import com.hdl.sdk.link.core.callback.ModbusCallBack;
@@ -100,10 +98,10 @@
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
//娣诲姞璁惧鍒颁簯绔�
String mac = getKeyValue("mac", getKeyValue("data", data));
- HdlDeviceLogic.getInstance().editGatewayParam(mac, new CloudCallBeak<Boolean>() {
+ HdlDeviceLogic.getInstance().setGatewayRemoteParam(mac, new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- HdlDeviceLogic.getInstance().steGatewayParam(mac, new CloudCallBeak<Boolean>() {
+ HdlDeviceLogic.getInstance().editGatewayParam(mac, new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
@@ -111,8 +109,8 @@
uniCallbackData(null, -100, "鏈湴鎵句笉鍒扮綉鍏�", callback);
return;
}
- HdlDeviceLogic.getInstance().addInverterDevice(mac,
- gatewayBean.getGateway_type(),
+ HdlDeviceLogic.getInstance().addInverterDeviceToCloud(mac,
+ gatewayBean.getGatewayType(),
gatewayBean.getSid(),
gatewayBean.getOid(),
gatewayBean.getDevice_name(),
@@ -123,29 +121,29 @@
}
@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);
}
});
}
break;
- case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_NET_LIST: {
//缃戝叧鎼滅储
HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
@Override
@@ -161,8 +159,46 @@
});
}
break;
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
+ //鑾峰彇缃戝叧璁惧鍒楄〃
+ HdlDeviceLogic.getInstance().getLocalGatewayList(new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ if (callback != null) {
+ uniCallbackData(HdlDeviceLogic.getInstance().getGatewayList(), callback);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (callback != null) {
+ uniCallbackData(null, -2, e.getMessage(), callback);
+ }
+ }
+ });
+ }
+ break;
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
sendModBus(data, callback);
+
+ }
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {
+ //娣诲姞璁惧鍒颁簯绔�
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ //鑾峰彇oid鍒楄〃
+ HdlDeviceLogic.getInstance().getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
+ @Override
+ public void onSuccess(List<OidBean> list) {
+ if (callback != null) {
+ uniCallbackData(list, callback);
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ uniCallbackData(null, -2, e.getMessage(), callback);
+ }
+ });
}
}
@@ -206,15 +242,22 @@
*/
void sendModBus(Object data, DCUniMPJSCallback callback) {
String tempData = getKeyValue("data", data);
- if (tempData == null) {
- LogUtils.i("data鍐呭涓虹┖");
+ if (TextUtils.isEmpty(tempData)) {
+ HdlLogLogic.print("data鍐呭涓虹┖");
return;
}
- ModBusBean modBusBean = com.alibaba.fastjson.JSONObject.parseObject(JSON.toJSONString(tempData), ModBusBean.class);
+ ModBusBean modBusBean = new Gson().fromJson(tempData, ModBusBean.class);
+// 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) {
- LogUtils.i("鍐呭涓虹┖,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
+ HdlLogLogic.print("鍐呭涓虹┖,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
return;
}
+
//鍙戦�乵odbus鍗忚
HDLModBusConnect.getInstance().Send(modBusBean.getOid(), modBusBean.getData(), new ModbusCallBack() {
@@ -337,6 +380,9 @@
if (TextUtils.isEmpty(obj.toString())) {
return new JSONObject();
}
+ if (obj.toString().startsWith("{") && obj.toString().endsWith("}")) {
+ return new JSONObject(obj.toString());
+ }
if (obj instanceof JSONObject) {
return (JSONObject) obj;
}
--
Gitblit v1.8.0