From 9b4a907c34c714497a2054f07f295b6fcf32cad7 Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期五, 30 六月 2023 10:35:34 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 92 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 70 insertions(+), 22 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 2fa728f..0cc1d91 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -1,6 +1,7 @@
package com.hdl.photovoltaic.other;
+import android.content.Intent;
import android.text.TextUtils;
import com.alibaba.fastjson.JSON;
@@ -23,6 +24,7 @@
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;
@@ -54,6 +56,8 @@
}
return sHdlUniLogic;
}
+
+ //region ******銆愬師鐢熴�戝拰銆愬皬绋嬪簭銆戦�氳鐨勬柟娉� onOtherUniMPEventReceive();openUniMP();sendUni();******
/**
* 鍘熺敓鎺ユ敹鍒皍ni鍙戞潵鐨勬暟鎹�
@@ -88,13 +92,57 @@
}
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().editGatewayParam(mac, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlDeviceLogic.getInstance().steGatewayParam(mac, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
+ if (gatewayBean == null) {
+ uniCallbackData(null, -100, "鏈湴鎵句笉鍒扮綉鍏�", callback);
+ return;
+ }
+ HdlDeviceLogic.getInstance().addInverterDevice(mac,
+ gatewayBean.getGateway_type(),
+ gatewayBean.getSid(),
+ gatewayBean.getOid(),
+ gatewayBean.getDevice_name(),
+ new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniCallbackData(null, callback);
+ }
+
+ @Override
+ public void onFailure(Exception exception) {
+ uniCallbackData(null, -100, exception.getMessage(), callback);
+ }
+ });
+ }
+
+ @Override
+ public void onFailure(Exception exception) {
+ uniCallbackData(null, -100, exception.getMessage(), callback);
+ }
+ });
+ }
+
+ @Override
+ public void onFailure(Exception exception) {
+ uniCallbackData(null, -100, exception.getMessage(), callback);
+ }
+ });
+
+
}
break;
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
@@ -102,24 +150,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);
}
}
@@ -130,14 +173,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;
@@ -157,32 +200,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(), e.getMsg(), callback);
}
});
}
@@ -221,6 +264,10 @@
public void checkRemoveOtherUniMPEventCallBack() {
HDLUniMPSDKManager.getInstance().checkRemoveOtherUniMPEventCallBack(this);
}
+ //endregion
+
+
+ //region ******涓�鑸柟娉�******
/**
* 缁勮uni鍙戦�佹暟鎹牸寮�
@@ -257,7 +304,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);
@@ -274,7 +321,7 @@
}
private void uniCallbackData(Object obj, DCUniMPJSCallback callback) {
- uniCallbackData(obj,HDLLinkCode.HDL_SUCCESS+"",HDLLinkCode.HDL_SUCCESS.getMsg(),callback);
+ uniCallbackData(obj, HDLLinkCode.HDL_SUCCESS.getCode(), HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
}
/**
@@ -319,6 +366,7 @@
return "";
}
}
+ //endregion
}
--
Gitblit v1.8.0