From 59340c0b9107c813d6b3a5c953d693212485ad11 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 20 八月 2025 13:31:22 +0800
Subject: [PATCH] 2025年08月20日13:31:14
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 115 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 96 insertions(+), 19 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..8c63f56 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -102,13 +102,16 @@
if (list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
GatewayBean gatewayBean = list.get(i);
- if (!getGatewaySpk().contains(gatewayBean.getGatewayType())) {
- continue;
- }
- if (TextUtils.isEmpty(gatewayBean.getDevice_mac())
- || TextUtils.isEmpty(gatewayBean.getSid())
- || TextUtils.isEmpty(gatewayBean.getOid())) {
- continue;
+ if (gatewayBean.isActivate()) {
+ //宸叉縺娲伙紙getGatewayType锛実etDevice_mac锛実etSid锛実etOid锛夋墠鏈夊��
+ if (!getGatewaySpk().contains(gatewayBean.getGatewayType())) {
+ continue;
+ }
+ if (TextUtils.isEmpty(gatewayBean.getDevice_mac())
+ || TextUtils.isEmpty(gatewayBean.getSid())
+ || TextUtils.isEmpty(gatewayBean.getOid())) {
+ continue;
+ }
}
//鐢╤omeId绛涢�夊綋鍓嶄綇瀹呯殑閫嗗彉鍣ㄥ垪琛�
if (gatewayBean.getHomeId().equals(homeId)) {
@@ -137,9 +140,9 @@
try {
List<GatewayBean> newList = new ArrayList<>();
//浜戠鏈夎澶囧垪琛紝鏈湴娌℃湁锛屽嵆HDLLinkLocalGateway.getInstance().getGatewayList()娌℃湁锛岄噷闈細璋冪敤refreshGatewayCacheData()鏂规硶铏氭嫙涓�涓�嗗彉鍣ㄥ疄浣撴坊鍔犳湰鍦板垪琛ㄩ噷闈紱
- List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
- if (list != null && list.size() > 0) {
- newList.addAll(list);
+ List<GatewayBean> localList = getCurrentHomeGatewayList(homeId);
+ if (localList != null && localList.size() > 0) {
+ newList.addAll(localList);
}
//鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴newList鍒楄〃涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
@@ -149,6 +152,7 @@
CloudInverterDeviceBean cloudInverterDevice = cloudInverterDeviceList.get(i);
for (GatewayBean gatewayBean : newList) {
if (cloudInverterDevice.getOsn().equals(gatewayBean.getDevice_mac())) {
+ //鑾峰彇鏇村叏閫嗗彉鍣ㄨ鎯呭瓧娈�
checkNewList.add(gatewayBean);
break;
}
@@ -157,7 +161,6 @@
newList.clear();
newList.addAll(checkNewList);
}
-
// //妯℃嫙璁惧鍒楄〃鏁版嵁
@@ -247,7 +250,7 @@
if (TextUtils.isEmpty(deviceId)) {
return;
}
- List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
+ List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
if (list == null || list.size() == 0) {
return;
}
@@ -259,9 +262,10 @@
break;
}
}
- if (index > 0) {
+ if (index > -1) {
list.remove(index);
}
+
}
/**
@@ -726,7 +730,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 +790,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 +1161,59 @@
}
+
+ /**
+ * 鍒犻櫎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);
+ }
+ }
+ });
+
+ }
+
+ /**
+ * 璁惧娓呯┖杩愯鏁版嵁
+ *
+ * @param mac 缃戝叧mac
+ * @param linkCallBack 鍥炶皟
+ */
+ public void DeviceClearData(String mac, LinkCallBack<Boolean> linkCallBack) {
+ String requestUrl = TopicApi.DEVICE_RUN_DATA_CLEAR;
+ TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", 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);
+ }
+ }
+ });
+
+ }
+
/**
* 鑾峰彇閫嗗彉鍣ㄥ垪琛�,鏁村悎浜戠閫嗗彉鍣ㄥ垪琛ㄥ拰鏈湴閫嗗彉鍣ㄥ垪琛�(璁惧绫诲瀷鏈�:骞剁綉閫嗗彉鍣紝绂荤嚎閫嗗彉鍣紝璐熻浇涓績璁惧);
* 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
@@ -1164,6 +1222,7 @@
* @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
*/
public void getCurrentHomeLocalAndCloudGatewayList(String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
+ HDLLinkLocalGateway.getInstance().getGatewayList().clear();//鍏堟竻绌轰箣鍓嶉�嗗彉鍣ㄥ垪琛�
searchCurrentHomeGateway(homeId, new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
@@ -1204,7 +1263,7 @@
if (loadCentreDeviceList == null) {
if (cloudCallBeak != null) {
//娌℃湁鏁版嵁锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
- cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null,false));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
}
return;
}
@@ -1216,7 +1275,7 @@
public void onFailure(HDLException e) {
//鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null,false));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
}
}
});
@@ -1295,13 +1354,28 @@
if (list == null || list.size() == 0) {
//浜戠娌℃湁缁戝畾閫嗗彉鍣�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list,false));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
}
return;
}
AtomicInteger atomicInteger = new AtomicInteger(0);
for (int i = 0; i < list.size(); i++) {
CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+ if (cloudInverterDeviceBean == null || !cloudInverterDeviceBean.isActivate()) {
+ //鏈縺娲昏澶�
+ atomicInteger.set(atomicInteger.get() + 1);
+ //娉ㄦ剰:杩欎釜閫嗗彉鍣ㄥ彧鑳芥湰鍦版帶鍒�(鍥犱负鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強GatewayID,鏃犳硶杩滅▼鎺у埗)
+ //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
+ refreshGatewayCacheData(false, cloudInverterDeviceBean, null, homeId);
+ //鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋�
+ if (atomicInteger.get() == list.size()) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
+ }
+ }
+ HdlLogLogic.print("璁惧鏈縺娲�(mac:" + cloudInverterDeviceBean.getOsn() + "))", true);
+ continue;
+ }
//鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
getDeviceRemoteInfo(homeId, cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
@Override
@@ -1312,7 +1386,7 @@
//鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋�
if (atomicInteger.get() == list.size()) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list,false));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
}
}
}
@@ -1326,7 +1400,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);
@@ -1804,6 +1878,9 @@
gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
}
gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
+ gatewayBean.setActivate(cloudInverterDeviceBean.isActivate());//鏄惁婵�娲昏澶�(true锛氭縺娲伙紱false锛氭湭婵�娲�)
+ gatewayBean.setPopUpgrade(cloudInverterDeviceBean.isPopUpgrade());//鏀硅澶囨槸鍚︽湁寮圭獥鍗囩骇
+ gatewayBean.setSubPopUpgrade(cloudInverterDeviceBean.isSubPopUpgrade());//涓嬫寕璁惧鏄惁鏈夊脊绐楀崌绾�
}
--
Gitblit v1.8.0