From b558b32b50e20f86ef786662d69eaa7280c397a6 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 16 五月 2025 18:07:47 +0800
Subject: [PATCH] 2025年05月16日18:07:44
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 9c3491d..9eb7e7f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -130,6 +130,7 @@
}
newList.clear();
newList.addAll(checkNewList);
+
}
// // 妯℃嫙璁惧鍒楄〃鏁版嵁
// List<GatewayBean> mockData = getGatewayDeviceListMockData(3);
@@ -1192,8 +1193,8 @@
@Override
public void onError(HDLLinkException e) {
- //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
- HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+// //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
+// HDLLinkLocalGateway.getInstance().getGatewayList().clear();
//鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
@@ -1274,7 +1275,7 @@
atomicInteger.set(atomicInteger.get() + 1);
//鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo, homeId);
- //鍒版渶鍚庝竴鏉★紝鎵嶆湁鍥炶皟
+ //鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋�
if (atomicInteger.get() == list.size()) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId, list));
@@ -1285,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, list));
}
}
- HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触---msg---" + e.getMsg() + "(" + e.getCode() + ")");
+ HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触(mac:"+cloudInverterDeviceBean.getOsn()+")------" + e.getMsg() + "(" + e.getCode() + ")",true);
}
});
}
@@ -1752,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:鐢垫睜鍗曞厓)
@@ -1767,6 +1772,7 @@
gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
+
}
--
Gitblit v1.8.0