From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 295 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 170 insertions(+), 125 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 ff46904..2a871dd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -38,8 +38,10 @@
import java.lang.reflect.Type;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -88,24 +90,62 @@
/**
* 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�(鍖呮嫭浠庣殑閫嗗彉鍣�)
+ *
+ * @param homeId 鐢电珯ID
+ * @param cloudInverterDeviceList 鍏冪涓婄殑閫嗗彉鍣ㄥ垪琛紙骞剁綉锛岀缃戯紝璐熻浇涓績锛�
*/
- public List<GatewayBean> getCurrentHomeGatewayList(String homeId) {
- List<GatewayBean> newList = new ArrayList<>();
- List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
- if (list.size() > 0) {
- for (int i = 0; i < list.size(); i++) {
- GatewayBean gatewayBean = list.get(i);
- if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
- continue;
- }
- //鐢╤omeId绛涢�夊綋鍓嶄綇瀹呯殑閫嗗彉鍣ㄥ垪琛�
- if (gatewayBean.getHomeId().equals(homeId)) {
- newList.add(gatewayBean);
+ public List<GatewayBean> getCurrentHomeGatewayList(String homeId, List<CloudInverterDeviceBean> cloudInverterDeviceList) {
+ try {
+ List<GatewayBean> newList = new ArrayList<>();
+ //浜戠鏈夎澶囧垪琛紝鏈湴娌℃湁锛屽嵆HDLLinkLocalGateway.getInstance().getGatewayList()娌℃湁锛岄噷闈細璋冪敤refreshGatewayCacheData()鏂规硶铏氭嫙涓�涓�嗗彉鍣ㄥ疄浣撴坊鍔犳湰鍦板垪琛ㄩ噷闈紱
+ List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
+ 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;
+ }
+ //鐢╤omeId绛涢�夊綋鍓嶄綇瀹呯殑閫嗗彉鍣ㄥ垪琛�
+ if (gatewayBean.getHomeId().equals(homeId)) {
+ newList.add(gatewayBean);
+ }
}
}
+ //鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
+ if (cloudInverterDeviceList != null && cloudInverterDeviceList.size() > 0) {
+ List<GatewayBean> checkNewList = new ArrayList<>();
+ for (int i = 0; i < cloudInverterDeviceList.size(); i++) {
+ CloudInverterDeviceBean cloudInverterDevice = cloudInverterDeviceList.get(i);
+ for (GatewayBean gatewayBean : newList) {
+ if (cloudInverterDevice.getOsn().equals(gatewayBean.getDevice_mac())) {
+ checkNewList.add(gatewayBean);
+ break;
+ }
+ }
+ }
+ newList.clear();
+ newList.addAll(checkNewList);
+
+ }
+// // 妯℃嫙璁惧鍒楄〃鏁版嵁
+// List<GatewayBean> mockData = getGatewayDeviceListMockData(3);
+// if (mockData.size() > 0) {
+// for (GatewayBean mockDatum : mockData) {
+// newList.add(0, mockDatum);
+// }
+// }
+
+ return newList;
+ } catch (Exception e) {
+ return new ArrayList<>();
}
- return newList;
}
+
/**
* 娣诲姞閫嗗彉鍣ㄥ埌缂撳瓨鍒楄〃閲岄潰鍘�
@@ -117,7 +157,7 @@
if (newGatewayBean == null || TextUtils.isEmpty(homeId)) {
return;
}
- List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
+ List<GatewayBean> list = getCurrentHomeGatewayList(homeId, null);
if (list == null || list.size() == 0) {
return;
}
@@ -146,7 +186,7 @@
if (TextUtils.isEmpty(mac)) {
return;
}
- List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
+ List<GatewayBean> list = getCurrentHomeGatewayList(homeId, null);
if (list == null || list.size() == 0) {
return;
}
@@ -173,7 +213,7 @@
if (TextUtils.isEmpty(deviceId)) {
return;
}
- List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
+ List<GatewayBean> list = getCurrentHomeGatewayList(homeId, null);
if (list == null || list.size() == 0) {
return;
}
@@ -326,6 +366,7 @@
@Override
public void onError(HDLLinkException e) {
+ HdlLogLogic.print("鑾峰彇oid鍒楄〃澶辫触---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
SystemClock.sleep(200);
@@ -333,10 +374,13 @@
} else {
//鍙湁杩涘叆璇︽儏鐣岄潰
List<OidBean> newOidList = new ArrayList<>();
+ //琛ㄧず涓棿浠讳綍涓�涓幏鍙杘id澶辫触銆傞兘瑕佹敼鍙樼敤澧為噺涓婁紶oid鍒楄〃
+ AtomicBoolean isIncrementalOidAddition = new AtomicBoolean(false);
AtomicInteger atomicInteger = new AtomicInteger(0);
for (int i = 0; i < list.size(); i++) {
GatewayBean gatewayBean = list.get(i);
if (gatewayBean == null || TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
+// isIncrementalOidAddition.set(true);
continue;
}
getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() {
@@ -344,6 +388,7 @@
public void onSuccess(List<OidBean> oidBeanList) {
atomicInteger.set(atomicInteger.get() + 1);
if (oidBeanList == null) {
+// isIncrementalOidAddition.set(true);
return;
}
newOidList.addAll(oidBeanList);
@@ -351,36 +396,39 @@
if (newOidList.isEmpty()) {
return;
}
-// //澧為噺娣诲姞oid
-// updateOidAdd(homeId, oidList, new CloudCallBeak<Boolean>() {
-// @Override
-// public void onSuccess(Boolean obj) {
-// HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac(), true);
-// }
-//
-// @Override
-// public void onFailure(HDLException e) {
-// HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
-// }
-// });
+ if (isIncrementalOidAddition.get()) {
+ //澧為噺娣诲姞oid
+ updateOidAdd(homeId, newOidList, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�(澧為噺)---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "---\r\n鏁版嵁---" + new Gson().toJson(oidBeanList), true);
+ }
- //鍏ㄩ儴鑾峰彇鍚庡啀涓婁紶
- fullUpdateOid(homeId, newOidList, new CloudCallBeak<Boolean>() {
- @Override
- public void onSuccess(Boolean obj) {
- HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�(鍏ㄩ噺)---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "---\r\n鏁版嵁---" + new Gson().toJson(newOidList), true);
- }
+ @Override
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
+ } else {
+ //鍏ㄩ儴鑾峰彇鍚庡啀涓婁紶
+ fullUpdateOid(homeId, newOidList, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�(鍏ㄩ噺)---浣忓畢id:" + homeId + "---\r\n鏁版嵁---" + new Gson().toJson(newOidList), true);
+ }
- @Override
- public void onFailure(HDLException e) {
- HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�(鍏ㄩ噺)---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
- }
- });
+ @Override
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�(鍏ㄩ噺)---浣忓畢id:" + homeId + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
+ }
}
}
@Override
public void onError(HDLLinkException e) {
+ isIncrementalOidAddition.set(true);
atomicInteger.set(atomicInteger.get() + 1);
if (atomicInteger.get() == list.size()) {
if (newOidList.isEmpty()) {
@@ -434,8 +482,16 @@
public void onSuccess(String str) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
- //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔�
- List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId);
+ List<GatewayBean> list = new ArrayList<>();
+ GatewayBean gatewayBean = new GatewayBean();
+ gatewayBean.setHomeId(homeId);
+ gatewayBean.setDevice_mac(mac);
+ gatewayBean.setSpk(spk);
+ gatewayBean.setSid(sid);
+ gatewayBean.setOid(oid);
+ gatewayBean.setDevice_name(name);
+ list.add(gatewayBean);
+ //娣诲姞璁惧鎴愬姛鍚庯紝涓婁紶oid鍒楄〃鍒颁簯绔�
uploadOidDataToCloud(homeId, list, true, null);
}
}
@@ -630,7 +686,7 @@
HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�---褰撳墠浣忓畢id:" + UserConfigManage.getInstance().getHomeId() + "---涓婁紶浣忓畢id:" + homeId, true);
return;
}
- if (oidList == null || oidList.size() == 0) {
+ if (oidList == null || oidList.isEmpty()) {
HdlLogLogic.print("oid鍒楄〃涓虹┖锛屾棤娉曞叏閲忔洿鏂皁id鍒颁簯绔�---", true);
return;
}
@@ -689,7 +745,7 @@
HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�---褰撳墠浣忓畢id:" + UserConfigManage.getInstance().getHomeId() + "---涓婁紶浣忓畢id:" + homeId, true);
return;
}
- if (oidList == null || oidList.size() == 0) {
+ if (oidList == null || oidList.isEmpty()) {
HdlLogLogic.print("oid鍒楄〃涓虹┖锛屾棤娉曞閲忔坊鍔爋id鍒颁簯绔�---", true);
return;
}
@@ -699,6 +755,10 @@
JsonArray jsonArray = new JsonArray();
for (int i = 0; i < oidList.size(); i++) {
OidBean oidBean = oidList.get(i);
+ if (TextUtils.isEmpty(oidBean.getDevice_model())) {
+ //涓虹┖杩囨护鎺�;
+ continue;
+ }
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("protocolType", oidBean.getProtocolType());
jsonObject.addProperty("deviceType", oidBean.getDeviceType());
@@ -721,7 +781,7 @@
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
}
- HdlLogLogic.print("澧為噺娣诲姞oid鍒颁簯绔垚鍔�---");
+ HdlLogLogic.print("澧為噺娣诲姞oid鍒颁簯绔垚鍔�---", true);
}
@Override
@@ -1063,8 +1123,8 @@
}
/**
- * 鑾峰彇閫嗗彉鍣ㄥ垪琛�(鏁村悎浜戠鍜屾湰鍦板垪琛�)
- * 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囦负鍑�,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘惁鍒欙紝娌℃湁澶栫綉鍙湁灞�鍩熺綉锛屼互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
+ * 鑾峰彇閫嗗彉鍣ㄥ垪琛�,鏁村悎浜戠閫嗗彉鍣ㄥ垪琛ㄥ拰鏈湴閫嗗彉鍣ㄥ垪琛�(璁惧绫诲瀷鏈�:骞剁綉閫嗗彉鍣紝绂荤嚎閫嗗彉鍣紝璐熻浇涓績璁惧);
+ * 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
*
* @param homeId 浣忓畢id
* @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
@@ -1073,7 +1133,6 @@
searchCurrentHomeGateway(homeId, new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
- //灞�鍩熺綉鏈�2绉嶆儏鍐�(1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�2:鏈夊眬鍩熺綉锛屾病鏈夊缃�);
//鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
@@ -1086,38 +1145,14 @@
//鍚堝苟璐熻浇涓績璁惧鍒楄〃锛岀劧鍚庡湪涓�璧峰仛澶勭悊
inverterDeviceList.addAll(loadCentreDeviceList);
}
- List<String> removeSidList = new ArrayList<>();
- for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
- GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
- if (querySidInverter(inverterDeviceList, gatewayBean.getSid())) {
- //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
- removeSidList.add(gatewayBean.getSid());
- }
- }
- for (int i = 0; i < removeSidList.size(); i++) {
- //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
- removeLocalInverter(removeSidList.get(i));
- }
- //鎯呭喌1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
setDeviceRemoteInfo(inverterDeviceList, homeId, cloudCallBeak);
}
@Override
public void onFailure(HDLException e) {
//鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛屼粛鐒跺鐞嗛�嗗彉鍣ㄨ澶囧垪琛�
- List<String> removeSidList = new ArrayList<>();
- for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
- GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
- if (querySidInverter(inverterDeviceList, gatewayBean.getSid())) {
- //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
- removeSidList.add(gatewayBean.getSid());
- }
- }
- for (int i = 0; i < removeSidList.size(); i++) {
- //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
- removeLocalInverter(removeSidList.get(i));
- }
- //鎯呭喌1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
setDeviceRemoteInfo(inverterDeviceList, homeId, cloudCallBeak);
}
});
@@ -1127,7 +1162,6 @@
@Override
public void onFailure(HDLException e) {
- ///鎯呭喌2:鏈夊眬鍩熺綉锛屾病鏈夊缃�;
//鏈湴鏈夐�嗗彉鍣ㄥ垪琛�,鑾峰彇浜戠缁戝畾閫嗗彉鍣ㄥけ璐�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
//鍚戜簯绔幏鍙栬礋杞戒腑蹇冨垪琛�
getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@@ -1135,27 +1169,12 @@
public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
if (loadCentreDeviceList == null) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ //娌℃湁鏁版嵁锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId, null));
}
return;
}
- List<String> removeSidList = new ArrayList<>();
- for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
- GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
- if (!isLoadCenterSpk(gatewayBean.getSpk())) {
- //涓嶆槸璐熻浇涓績鐨剆pk涓嶅仛澶勭悊锛�
- continue;
- }
- if (querySidInverter(loadCentreDeviceList, gatewayBean.getSid())) {
- //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
- removeSidList.add(gatewayBean.getSid());
- }
- }
- for (int i = 0; i < removeSidList.size(); i++) {
- //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
- removeLocalInverter(removeSidList.get(i));
- }
- //鎯呭喌1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
setDeviceRemoteInfo(loadCentreDeviceList, homeId, cloudCallBeak);
}
@@ -1163,21 +1182,19 @@
public void onFailure(HDLException e) {
//鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId, null));
}
}
});
-// if (cloudCallBeak != null) {
-// cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
-// }
}
});
}
@Override
public void onError(HDLLinkException e) {
- //澶栫綉鍙湁1绉嶆儏鍐�(鏈湴鎼滅储閫嗗彉鍣ㄥ垪琛ㄥけ璐ヤ簡)
+ //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
+ HDLLinkLocalGateway.getInstance().getGatewayList().clear();
//鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
@@ -1186,30 +1203,26 @@
getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
- //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
- HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+
List<CloudInverterDeviceBean> newList = new ArrayList<>();
if (cloudInverterList != null) {
+ //娣诲姞閫嗗彉鍣ㄨ澶囧垪琛�
newList.addAll(cloudInverterList);
}
if (loadCentreDeviceList != null) {
+ //娣诲姞璐熻浇涓績璁惧鍒楄〃
newList.addAll(loadCentreDeviceList);
}
- //閫嗗彉鍣ㄥ垪琛ㄥ拰璐熻浇涓績鍒楄〃鐩稿姞
+ //鏁村悎璁惧鍒楄〃鍚�,鍐嶄竴璧疯缃澶囩殑杩滅▼淇℃伅
setDeviceRemoteInfo(newList, homeId, cloudCallBeak);
}
@Override
public void onFailure(HDLException e) {
- //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
- //鍚戜簯绔幏鍙栬礋杞戒腑蹇冨垪琛ㄥけ璐�,鐩存帴杩斿洖閫嗗彉鍣ㄥ垪琛紱
- HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
setDeviceRemoteInfo(cloudInverterList, homeId, cloudCallBeak);
}
});
-// //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
-// HDLLinkLocalGateway.getInstance().getGatewayList().clear();
-// setDeviceRemoteInfo(list, homeId, cloudCallBeak);
}
@Override
@@ -1219,22 +1232,18 @@
getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
- //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
- HDLLinkLocalGateway.getInstance().getGatewayList().clear();
- //閫嗗彉鍣ㄥ垪琛ㄥ拰璐熻浇涓績鍒楄〃
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
setDeviceRemoteInfo(loadCentreDeviceList, homeId, cloudCallBeak);
}
@Override
public void onFailure(HDLException e) {
+ //閮芥槸鑾峰彇澶辫触鐨勮瘽,鐩存帴杩斿洖绌哄垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
+ cloudCallBeak.onSuccess(new ArrayList<>());
}
}
});
-// if (cloudCallBeak != null) {
-// cloudCallBeak.onFailure(e);
-// }
}
});
}
@@ -1252,9 +1261,8 @@
if (list == null || list.size() == 0) {
//浜戠娌℃湁缁戝畾閫嗗彉鍣�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId, list));
}
-
return;
}
AtomicInteger atomicInteger = new AtomicInteger(0);
@@ -1270,7 +1278,7 @@
//鍒版渶鍚庝竴鏉★紝鎵嶆湁鍥炶皟
if (atomicInteger.get() == list.size()) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId, list));
}
}
}
@@ -1278,13 +1286,16 @@
@Override
public void onFailure(HDLException e) {
atomicInteger.set(atomicInteger.get() + 1);
+ //娉ㄦ剰:杩欎釜閫嗗彉鍣ㄥ彧鑳芥湰鍦版帶鍒�(鍥犱负鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強GatewayID,鏃犳硶杩滅▼鎺у埗)
+ //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
+ refreshGatewayCacheData(false, cloudInverterDeviceBean, null, homeId);
//褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鏈夊洖璋�
if (atomicInteger.get() == list.size()) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId, list));
}
}
- HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触---msg---" + e.getMsg() + "(" + e.getCode() + ")");
+ HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触(mac:"+cloudInverterDeviceBean.getOsn()+")------" + e.getMsg() + "(" + e.getCode() + ")",true);
}
});
}
@@ -1292,16 +1303,16 @@
}
/**
- * 閫氳繃sid鏌ヨ閫嗗彉鍣ㄦ槸鍚﹀瓨缁戝畾鍦ㄤ簯绔�
+ * 閫氳繃mac鏌ヨ閫嗗彉鍣ㄦ槸鍚﹀瓨缁戝畾鍦ㄤ簯绔�
*
* @param list 浜戠涓婇�嗗彉鍣ㄥ垪琛�
* @return true涓嶅瓨鍦紝鍚﹀垯瀛樺湪
*/
- private boolean querySidInverter(List<CloudInverterDeviceBean> list, String sid) {
+ private boolean queryMacInverter(List<CloudInverterDeviceBean> list, String mac) {
int exists_value = -1;
for (int i = 0; i < list.size(); i++) {
CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
- if (sid.equals(cloudInverterDeviceBean.getSid())) {
+ if (mac.equals(cloudInverterDeviceBean.getOsn())) {
exists_value = 1;
break;
}
@@ -1351,10 +1362,10 @@
/**
* 鍒犻櫎鏈湴缂撳瓨閫嗗彉鍣�
*
- * @param sid 璁惧sid
+ * @param mac 璁惧mac
*/
- private void removeLocalInverter(String sid) {
- GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(sid);
+ private void removeLocalInverter(String mac) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
if (gatewayBean != null) {
HDLLinkLocalGateway.getInstance().getGatewayList().remove(gatewayBean);
}
@@ -1745,7 +1756,8 @@
gatewayBean.setOgMaster(cloudInverterDeviceBean.isOgMaster());
//閫嗗彉鍣�
gatewayBean.setMaster(GatewayMasterType.MasterTrue);//榛樿閮芥槸涓婚�嗗彉鍣�(浠ュ悗鏀寔浠庨�嗗彉鍣ㄨ鏇存敼)
- gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵��
+ gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵�侊紙閫嗗彉鍣ㄨ澶囷級
+ gatewayBean.setWorkStatusDesc(cloudInverterDeviceBean.getWorkStatusDesc());//宸ヤ綔鐘舵�侊紙璐熻浇涓績璁惧锛�
gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙�
gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О
gatewayBean.setDeviceType(cloudInverterDeviceBean.getDeviceType());//璁惧绫诲瀷(INV:閫嗗彉鍣�;BMS:BMS鎺у埗鐩�;BATTERY:鐢垫睜鍗曞厓)
@@ -1758,6 +1770,7 @@
gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
}
gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
+
}
@@ -1789,6 +1802,38 @@
}
/**
+ * 妯℃嫙閫嗗彉鍣ㄨ澶囧垪琛�
+ *
+ * @param sum 妯℃嫙澶氬皯涓�
+ * @return 杩斿洖閫嗗彉鍣ㄥ垪琛�
+ */
+ public List<GatewayBean> getGatewayDeviceListMockData(int sum) {
+
+ try {
+ List<GatewayBean> list = new ArrayList<>();
+ for (int i = 0; i < sum; i++) {
+ String spk = getGatewaySpk().get(i % getGatewaySpk().size());
+ GatewayBean gatewayBean = new GatewayBean();
+ gatewayBean.setHomeId("100000000" + i);
+ gatewayBean.setDevice_mac("200000000" + i);
+ gatewayBean.setSpk(spk);
+ gatewayBean.setGateway_type(spk);
+ gatewayBean.setMaster("true");
+ gatewayBean.setSid("300000000" + i);
+ gatewayBean.setOid("400000000" + i);
+ gatewayBean.setGatewayId("500000000" + i);
+ gatewayBean.setDevice_name("妯℃嫙-" + i + "(" + spk + ")");
+ gatewayBean.setDeviceStatus(5);//榛樿閮芥槸绂荤嚎卢
+ list.add(gatewayBean);
+ }
+ return list;
+ } catch (Exception ignored) {
+ return new ArrayList<>();
+ }
+
+ }
+
+ /**
* 閫嗗彉鍣╯pk
*/
public final String INVERTER_DEVICE_SPK = "energy.hdl_inverter";
--
Gitblit v1.8.0