From 8c1e2e91e3f20af896c1863d0e8fad51b632b24f Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期六, 28 九月 2024 08:26:41 +0800 Subject: [PATCH] 2024年09月28日08:26:38 --- app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 63 ++++++++++++++++++++++++++++--- 1 files changed, 56 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 d93086a..571cc42 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -1166,19 +1166,63 @@ @Override public void onError(HDLLinkException e) { //澶栫綉鍙湁1绉嶆儏鍐�(鏈湴鎼滅储閫嗗彉鍣ㄥ垪琛ㄥけ璐ヤ簡) + //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛� getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() { @Override - public void onSuccess(List<CloudInverterDeviceBean> list) { - //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛� - HDLLinkLocalGateway.getInstance().getGatewayList().clear(); - setDeviceRemoteInfo(list, homeId, cloudCallBeak); + public void onSuccess(List<CloudInverterDeviceBean> cloudInverterList) { + //鍐嶅悜浜戠鑾峰彇璐熻浇涓績鍒楄〃 + 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 public void onFailure(HDLException e) { - if (cloudCallBeak != null) { - cloudCallBeak.onFailure(e); - } + //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛ㄥけ璐� + //鍐嶅悜浜戠鑾峰彇璐熻浇涓績鍒楄〃 + 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); + } + } + }); +// if (cloudCallBeak != null) { +// cloudCallBeak.onFailure(e); +// } } }); } @@ -1662,6 +1706,7 @@ public List<String> getGatewaySpk() { List<String> spks = new ArrayList<>(); spks.add(INVERTER_DEVICE_SPK); + spks.add(LC_SPK); return spks; } @@ -1681,4 +1726,8 @@ * 閫嗗彉鍣╯pk */ public final String INVERTER_DEVICE_SPK = "energy.hdl_inverter"; + /** + * 璐熻浇涓績spk + */ + public final String LC_SPK = "energy.hdl_lc"; } -- Gitblit v1.8.0