From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:49:17 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 93 insertions(+), 18 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 9eb7e7f..07c8a40 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -91,11 +91,11 @@
/**
* 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�(鍖呮嫭浠庣殑閫嗗彉鍣�)
*
- * @param homeId 鐢电珯ID
- * @param cloudInverterDeviceList 鍏冪涓婄殑閫嗗彉鍣ㄥ垪琛紙骞剁綉锛岀缃戯紝璐熻浇涓績锛�
+ * @param homeId 鐢电珯ID
*/
- public List<GatewayBean> getCurrentHomeGatewayList(String homeId, List<CloudInverterDeviceBean> cloudInverterDeviceList) {
+ public List<GatewayBean> getCurrentHomeGatewayList(String homeId) {
try {
+
List<GatewayBean> newList = new ArrayList<>();
//浜戠鏈夎澶囧垪琛紝鏈湴娌℃湁锛屽嵆HDLLinkLocalGateway.getInstance().getGatewayList()娌℃湁锛岄噷闈細璋冪敤refreshGatewayCacheData()鏂规硶铏氭嫙涓�涓�嗗彉鍣ㄥ疄浣撴坊鍔犳湰鍦板垪琛ㄩ噷闈紱
List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
@@ -116,7 +116,33 @@
}
}
}
- //鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
+
+
+ return newList;
+ } catch (Exception e) {
+ return new ArrayList<>();
+ }
+ }
+
+
+ /**
+ * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�(鍖呮嫭浠庣殑閫嗗彉鍣�)
+ * 鍙互璁剧疆鏄惁鏁村悎鏈湴閫嗗彉鍣ㄥ垪琛ㄦ暟鎹�
+ *
+ * @param homeId 鐢电珯ID
+ * @param cloudInverterDeviceList 浜戠涓婄殑閫嗗彉鍣ㄥ垪琛紙骞剁綉锛岀缃戯紝璐熻浇涓績锛�
+ * @param isIntegrateLocalData 鏄惁寮哄埗鏁村悎鏈湴閫嗗彉鍣ㄦ暟鎹紙false锛氫笉闇�瑕侊紙浠ヤ簯绔垪琛ㄤ负涓�(閫嗗彉鍣紝璐熻浇涓績)澶氬皯涓樉绀哄灏戜釜锛�,true锛氶渶瑕侊紙鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴鍒楄〃涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓級锛�
+ */
+ public List<GatewayBean> IntegrateCloudAndLocalData(String homeId, List<CloudInverterDeviceBean> cloudInverterDeviceList, boolean isIntegrateLocalData) {
+ try {
+ List<GatewayBean> newList = new ArrayList<>();
+ //浜戠鏈夎澶囧垪琛紝鏈湴娌℃湁锛屽嵆HDLLinkLocalGateway.getInstance().getGatewayList()娌℃湁锛岄噷闈細璋冪敤refreshGatewayCacheData()鏂规硶铏氭嫙涓�涓�嗗彉鍣ㄥ疄浣撴坊鍔犳湰鍦板垪琛ㄩ噷闈紱
+ List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
+ if (list != null && list.size() > 0) {
+ newList.addAll(list);
+ }
+
+ //鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴newList鍒楄〃涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
if (cloudInverterDeviceList != null && cloudInverterDeviceList.size() > 0) {
List<GatewayBean> checkNewList = new ArrayList<>();
for (int i = 0; i < cloudInverterDeviceList.size(); i++) {
@@ -130,9 +156,10 @@
}
newList.clear();
newList.addAll(checkNewList);
-
}
-// // 妯℃嫙璁惧鍒楄〃鏁版嵁
+
+
+// //妯℃嫙璁惧鍒楄〃鏁版嵁
// List<GatewayBean> mockData = getGatewayDeviceListMockData(3);
// if (mockData.size() > 0) {
// for (GatewayBean mockDatum : mockData) {
@@ -140,12 +167,18 @@
// }
// }
+ //鑳″浆瑕佹眰鐨� 2025骞�05鏈�19鏃�13:28:47 鍗充娇閫嗗彉鍣ㄥ垹闄や簡浜戠涓婃垚鍔燂紝鏈湴閫嗗彉鍣ㄥ垵濮嬪寲涓嶆垚鍔燂紙鏂紑锛変緷鐒朵笉鏄剧ず锛�
+ if (!isIntegrateLocalData) {
+ //寮哄埗浠ヤ簯绔负涓伙紝浜戠鏈夊氨鏄剧ず閫嗗彉鍣ㄥ垪琛紝娌℃湁灏变笉鏄剧ず
+ if (cloudInverterDeviceList == null || cloudInverterDeviceList.size() == 0) {
+ newList.clear();
+ }
+ }
return newList;
} catch (Exception e) {
return new ArrayList<>();
}
}
-
/**
* 娣诲姞閫嗗彉鍣ㄥ埌缂撳瓨鍒楄〃閲岄潰鍘�
@@ -157,7 +190,7 @@
if (newGatewayBean == null || TextUtils.isEmpty(homeId)) {
return;
}
- List<GatewayBean> list = getCurrentHomeGatewayList(homeId, null);
+ List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
if (list == null || list.size() == 0) {
return;
}
@@ -186,7 +219,7 @@
if (TextUtils.isEmpty(mac)) {
return;
}
- List<GatewayBean> list = getCurrentHomeGatewayList(homeId, null);
+ List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
if (list == null || list.size() == 0) {
return;
}
@@ -213,7 +246,7 @@
if (TextUtils.isEmpty(deviceId)) {
return;
}
- List<GatewayBean> list = getCurrentHomeGatewayList(homeId, null);
+ List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
if (list == null || list.size() == 0) {
return;
}
@@ -692,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++) {
@@ -752,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);
@@ -1122,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);
+ }
+ }
+ });
+
+ }
+
/**
* 鑾峰彇閫嗗彉鍣ㄥ垪琛�,鏁村悎浜戠閫嗗彉鍣ㄥ垪琛ㄥ拰鏈湴閫嗗彉鍣ㄥ垪琛�(璁惧绫诲瀷鏈�:骞剁綉閫嗗彉鍣紝绂荤嚎閫嗗彉鍣紝璐熻浇涓績璁惧);
* 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
@@ -1170,7 +1231,7 @@
if (loadCentreDeviceList == null) {
if (cloudCallBeak != null) {
//娌℃湁鏁版嵁锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId, null));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
}
return;
}
@@ -1182,7 +1243,7 @@
public void onFailure(HDLException e) {
//鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId, null));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
}
}
});
@@ -1261,13 +1322,27 @@
if (list == null || list.size() == 0) {
//浜戠娌℃湁缁戝畾閫嗗彉鍣�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId, list));
+ 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);
+ }
//鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
getDeviceRemoteInfo(homeId, cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
@Override
@@ -1278,7 +1353,7 @@
//鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋�
if (atomicInteger.get() == list.size()) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId, list));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
}
}
}
@@ -1292,10 +1367,10 @@
//鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋�
if (atomicInteger.get() == list.size()) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId, list));
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
}
}
- HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触(mac:"+cloudInverterDeviceBean.getOsn()+")------" + e.getMsg() + "(" + e.getCode() + ")",true);
+ HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触(mac:" + cloudInverterDeviceBean.getOsn() + ")------" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
}
@@ -1770,7 +1845,7 @@
gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
}
gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
-
+ gatewayBean.setActivate(cloudInverterDeviceBean.isActivate());//鏄惁婵�娲昏澶�(true锛氭縺娲伙紱false锛氭湭婵�娲�)
}
--
Gitblit v1.8.0