From e604e1797744977f599dad9f543db3e7477fe115 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 12 七月 2023 14:35:58 +0800
Subject: [PATCH] 2023年07月12日14:35:48
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 123 +++++++++++++++++++++++++++++++++++-----
1 files changed, 107 insertions(+), 16 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 011334f..5837237 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -1,29 +1,28 @@
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;
import com.hdl.sdk.link.core.connect.HDLModBusConnect;
+import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
@@ -91,16 +90,60 @@
}
if (callback != null) {
- uniCallbackData(null, "0", "", callback);
+ uniCallbackData(null, callback);
}
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(event)) {
//璁惧妯″潡
switch (type) {
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
- //娣诲姞
+ //娣诲姞璁惧鍒颁簯绔�
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().steGatewayParam(mac, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlDeviceLogic.getInstance().editGatewayParam(mac, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
+ if (gatewayBean == null) {
+ uniCallbackData(null, -100, "鏈湴鎵句笉鍒扮綉鍏�", callback);
+ return;
+ }
+ HdlDeviceLogic.getInstance().addInverterDeviceToCloud(mac,
+ gatewayBean.getGatewayType(),
+ gatewayBean.getSid(),
+ gatewayBean.getOid(),
+ gatewayBean.getDevice_name(),
+ new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniCallbackData(null, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(null, -100, e.getMessage(), callback);
+ }
+ });
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ uniCallbackData(null, -100, e.getMessage(), callback);
+ }
+ });
+ }
+
+ @Override
+ 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
@@ -111,13 +154,51 @@
@Override
public void onError(HDLLinkException e) {
//鍙戦�佸け璐�
- uniCallbackData(null, e.getCode() + "", "", callback);
+ uniCallbackData(null, e.getCode(), "", callback);
+ }
+ });
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
+ //鑾峰彇缃戝叧璁惧鍒楄〃
+ HdlDeviceLogic.getInstance().getLocalGatewayList(new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ if (callback != null) {
+ uniCallbackData(HDLLinkLocalGateway.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);
+ }
+ });
}
}
@@ -161,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() {
@@ -180,7 +268,7 @@
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, e.getCode() + "", "澶辫触", callback);
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
}
@@ -259,7 +347,7 @@
* @param msg 缁撴灉鎻忚堪鐨勪俊鎭�
* @param callback 鍥炶皟
*/
- private void uniCallbackData(Object obj, String code, String msg, DCUniMPJSCallback callback) {
+ private void uniCallbackData(Object obj, int code, String msg, DCUniMPJSCallback callback) {
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
try {
uniCallBackBaseBean.setCode(code);
@@ -276,7 +364,7 @@
}
private void uniCallbackData(Object obj, DCUniMPJSCallback callback) {
- uniCallbackData(obj, HDLLinkCode.HDL_SUCCESS.getCode() + "", HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
+ uniCallbackData(obj, HDLLinkCode.HDL_SUCCESS.getCode(), HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
}
/**
@@ -292,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