From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 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 fb7681f..104b350 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -157,11 +157,12 @@
list.remove(index);
}
}
+
/**
* 绉婚櫎缂撳瓨鍒楄〃閲岄潰閫嗗彉鍣�
*
- * @param homeId 鐢电珯id
- * @param deviceId 閫嗗彉鍣╠eviceId
+ * @param homeId 鐢电珯id
+ * @param deviceId 閫嗗彉鍣╠eviceId
*/
public void removeLocalCacheMemoryGatewayToDeviceId(String homeId, String deviceId) {
if (TextUtils.isEmpty(deviceId)) {
@@ -493,22 +494,7 @@
@Override
public void onFailure(HDLException e) {
- //娣诲姞閫嗗彉鍣ㄥけ璐ュ悗鍒濆鍖栭�嗗彉鍣�
- HdlLogLogic.print("娣诲姞閫嗗彉鍣ㄥけ璐ュ悗寮�濮嬪垵濮嬪寲閫嗗彉鍣�-->", true);
- for (int i = 0; i < list.size(); i++) {
- GatewayBean gatewayBean = list.get(i);
- HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
- @Override
- public void onSuccess(Boolean obj) {
- HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + gatewayBean.getDevice_mac(), true);
- }
- @Override
- public void onError(HDLLinkException e) {
- HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄥけ璐�-->mac:" + gatewayBean.getDevice_mac(), true);
- }
- });
- }
if (cloudCallBeak != null) {
cloudCallBeak.onFailure(e);
}
@@ -1055,7 +1041,7 @@
/**
* 鑾峰彇閫嗗彉鍣ㄥ垪琛�(鏁村悎浜戠鍜屾湰鍦板垪琛�)
- * 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囦负鍑�,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戯紝浠ユ湰鍦颁负涓�,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
+ * 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囦负鍑�,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘惁鍒欙紝娌℃湁澶栫綉鍙湁灞�鍩熺綉锛屼互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
*
* @param homeId 浣忓畢id
* @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
@@ -1068,7 +1054,19 @@
HdlDeviceLogic.getInstance().getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterDeviceBean> list) {
- ///鎯呭喌1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�
+ List<String> removeSidList = new ArrayList<>();
+ for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
+ if (!querySidInverter(list, gatewayBean.getSid())) {
+ //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
+ removeSidList.add(gatewayBean.getSid());
+ }
+ }
+ for (int i = 0; i < removeSidList.size(); i++) {
+ //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
+ removeLocalInverter(removeSidList.get(i));
+ }
+ //鎯呭喌1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�
setDeviceRemoteInfo(list, homeId, cloudCallBeak);
}
@@ -1416,6 +1414,7 @@
gatewayBean.setDeviceType(cloudInverterDeviceBean.getDeviceType());//璁惧绫诲瀷(INV:閫嗗彉鍣�;BMS:BMS鎺у埗鐩�;BATTERY:鐢垫睜鍗曞厓)
gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�,閫嗗彉鍣ㄥ湴鍧�
gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
+ gatewayBean.setOutputActivePower(cloudInverterDeviceBean.getOutputActivePower());//閫嗗彉鍣ㄨ緭鍑烘湁鍔熷姛鐜�
gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
if (!TextUtils.isEmpty(cloudInverterDeviceBean.getOmodel())) {
//鍙兘璁惧娌℃湁涓婃姤缁欎簯绔�,寤鸿缁戝畾閫嗗彉鍣ㄦ椂鍊欒拷鍔犱竴涓弬鏁�;
--
Gitblit v1.8.0