From 0cd180b3fdfc5e4a4274cb68aab775a0b47e0994 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 29 六月 2023 15:35:55 +0800
Subject: [PATCH] 2023年06月29日15:35:53
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 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 b0e1592..fa50ef7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -105,23 +105,19 @@
HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
- HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
- callBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_LIST);
- callBackBaseBean.setData(gatewayBeanList);
-// sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, callBackBaseBean);
- uniCallbackData(callBackBaseBean, callback);
+ uniCallbackData(gatewayBeanList, callback);
}
@Override
public void onError(HDLLinkException e) {
//鍙戦�佸け璐�
- uniCallbackData(null, e.getCode()+"", "", callback);
+ uniCallbackData(null, e.getCode() + "", "", callback);
}
});
}
break;
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
- sendModBus(data,callback);
+ sendModBus(data, callback);
}
}
@@ -132,14 +128,14 @@
case HDLUniMP.UNI_EVENT_REPLY_WIFI_LIST: {
//鑾峰彇wifi鍒楄〃
if (callback != null) {
- uniCallbackData(wifiUtils.getScanResult(), "0", "", callback);
+ uniCallbackData(wifiUtils.getScanResult(), callback);
}
}
break;
case HDLUniMP.UNI_EVENT_REPLY_WIFI_INFO: {
//褰撳墠wifi璇︽儏
if (callback != null) {
- uniCallbackData(wifiUtils.getCurrentConnectWifiInfo(), "0", "", callback);
+ uniCallbackData(wifiUtils.getCurrentConnectWifiInfo(), callback);
}
}
break;
@@ -159,32 +155,32 @@
/**
* 鍙戦�乵odbus鍗忚鏁版嵁
- * @param data modbus鏁版嵁
+ *
+ * @param data modbus鏁版嵁
* @param callback 鍥炶皟
*/
- void sendModBus(Object data,DCUniMPJSCallback callback)
- {
+ void sendModBus(Object data, DCUniMPJSCallback callback) {
String tempData = getKeyValue("data", data);
- if(tempData==null){
+ if (tempData == null) {
LogUtils.i("data鍐呭涓虹┖");
return;
}
ModBusBean modBusBean = com.alibaba.fastjson.JSONObject.parseObject(JSON.toJSONString(tempData), ModBusBean.class);
- if(modBusBean.getOid()==null || modBusBean.getData()==null) {
- LogUtils.i("鍐呭涓虹┖,oid="+modBusBean.getOid()+" data="+modBusBean.getData());
+ if (modBusBean.getOid() == null || modBusBean.getData() == null) {
+ LogUtils.i("鍐呭涓虹┖,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
return;
}
//鍙戦�乵odbus鍗忚
HDLModBusConnect.getInstance().Send(modBusBean.getOid(), modBusBean.getData(), new ModbusCallBack() {
@Override
- public void onSuccess(byte []data) {
+ public void onSuccess(byte[] data) {
uniCallbackData(data, callback);
}
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null,e.getCode()+"","澶辫触",callback);
+ uniCallbackData(null, e.getCode() + "", "澶辫触", callback);
}
});
}
@@ -280,7 +276,7 @@
}
private void uniCallbackData(Object obj, DCUniMPJSCallback callback) {
- uniCallbackData(obj,HDLLinkCode.HDL_SUCCESS+"",HDLLinkCode.HDL_SUCCESS.getMsg(),callback);
+ uniCallbackData(obj, HDLLinkCode.HDL_SUCCESS + "", HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
}
/**
--
Gitblit v1.8.0