From 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:56:35 +0800
Subject: [PATCH] Merge branch 'master' into 1.2.1_google
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index dfdbde9..4f12d4c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -159,7 +159,6 @@
}
-
// //妯℃嫙璁惧鍒楄〃鏁版嵁
// List<GatewayBean> mockData = getGatewayDeviceListMockData(3);
// if (mockData.size() > 0) {
@@ -726,7 +725,7 @@
}
String requestUrl = HttpApi.POST_Device_Oid;
JsonObject json = new JsonObject();
- json.addProperty("operationSource", "PROGRAM_ENERGY");//
+ json.addProperty("operationSource", "PROGRAM_ENERGY");//鎿嶄綔鏉ユ簮锛氬浐瀹氫紶锛歅ROGRAM_ENERGY = 鑳芥簮锛孭ROGRAM = studio 榛樿
json.addProperty("homeId", homeId);
JsonArray jsonArray = new JsonArray();
for (int i = 0; i < oidList.size(); i++) {
@@ -786,6 +785,7 @@
String requestUrl = HttpApi.POST_Device_IncrAdd;
JsonObject json = new JsonObject();
json.addProperty("homeId", homeId);
+ json.addProperty("operationSource", "PROGRAM_ENERGY");//鎿嶄綔鏉ユ簮锛氬浐瀹氫紶锛歅ROGRAM_ENERGY = 鑳芥簮锛孭ROGRAM = studio 榛樿
JsonArray jsonArray = new JsonArray();
for (int i = 0; i < oidList.size(); i++) {
OidBean oidBean = oidList.get(i);
@@ -1156,6 +1156,33 @@
}
+
+ /**
+ * 鍒犻櫎oid锛堥�嗗彉鍣紝bms锛岀數姹犲寘锛�
+ *
+ * @param mac 缃戝叧mac
+ * @param linkCallBack 鍥炶皟
+ */
+ public void deleteOid(String mac, JsonArray oidList, LinkCallBack<Boolean> linkCallBack) {
+ String requestUrl = TopicApi.DELETE_DEVICE;
+ TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, oidList, "", new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String json) {
+ if (linkCallBack != null) {
+ linkCallBack.onSuccess(true);
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ if (linkCallBack != null) {
+ linkCallBack.onError(e);
+ }
+ }
+ });
+
+ }
+
/**
* 鑾峰彇閫嗗彉鍣ㄥ垪琛�,鏁村悎浜戠閫嗗彉鍣ㄥ垪琛ㄥ拰鏈湴閫嗗彉鍣ㄥ垪琛�(璁惧绫诲瀷鏈�:骞剁綉閫嗗彉鍣紝绂荤嚎閫嗗彉鍣紝璐熻浇涓績璁惧);
* 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
@@ -1204,7 +1231,7 @@
if (loadCentreDeviceList == null) {
if (cloudCallBeak != null) {
//娌℃湁鏁版嵁锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
- cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null,false));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
}
return;
}
@@ -1216,7 +1243,7 @@
public void onFailure(HDLException e) {
//鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null,false));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
}
}
});
@@ -1295,7 +1322,7 @@
if (list == null || list.size() == 0) {
//浜戠娌℃湁缁戝畾閫嗗彉鍣�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list,false));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
}
return;
}
@@ -1312,7 +1339,7 @@
//鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋�
if (atomicInteger.get() == list.size()) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list,false));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
}
}
}
@@ -1326,7 +1353,7 @@
//鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋�
if (atomicInteger.get() == list.size()) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list,false));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
}
}
HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触(mac:" + cloudInverterDeviceBean.getOsn() + ")------" + e.getMsg() + "(" + e.getCode() + ")", true);
--
Gitblit v1.8.0