From 05581cb7328000de65c5e8c1ef12b366b44b11b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 四月 2024 13:47:41 +0800
Subject: [PATCH] 2024年04月02日13:47:34
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 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 1c00f40..cb3bbd3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -1,5 +1,6 @@
package com.hdl.photovoltaic.other;
+import android.os.SystemClock;
import android.text.TextUtils;
import com.facebook.imagepipeline.image.OriginalEncodedImageInfo;
@@ -102,7 +103,6 @@
List<OidBean> oidList = new ArrayList<>();
AtomicInteger atomicInteger = new AtomicInteger(0);
for (int i = 0; i < list.size(); i++) {
- atomicInteger.set(atomicInteger.get() + 1);
GatewayBean gatewayBean = list.get(i);
if (gatewayBean == null || TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
continue;
@@ -110,11 +110,28 @@
getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() {
@Override
public void onSuccess(List<OidBean> oidBeanList) {
+ atomicInteger.set(atomicInteger.get() + 1);
if (oidBeanList == null) {
return;
}
oidList.addAll(oidBeanList);
if (atomicInteger.get() == list.size()) {
+ if (oidList.size() == 0) {
+ 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);
+// }
+// });
+
//鍏ㄩ儴鑾峰彇鍚庡啀涓婁紶
fullUpdateOid(homeId, oidList, new CloudCallBeak<Boolean>() {
@Override
@@ -132,9 +149,26 @@
@Override
public void onError(HDLLinkException e) {
- HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ atomicInteger.set(atomicInteger.get() + 1);
+ if (oidList.size() == 0) {
+ HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ 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);
+ }
+ });
}
});
+ SystemClock.sleep(200);
}
@@ -212,8 +246,8 @@
public void onSuccess(String str) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
- //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔�
- uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), list, null);
+ //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔紙鍘绘帀锛屽師鍥犳槸鎴戜笂浼犳垚鍔熷悗锛岀綉鍏冲啀娆″叏閲忎笂浼爋id鍒楄〃锛屼細鎶婁箣鍓峯id鍒楄〃瑕嗙洊鎺夛級
+ uploadDataToCloud(homeId, list, null);
}
}
@@ -1147,7 +1181,9 @@
gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�,閫嗗彉鍣ㄥ湴鍧�
gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
- gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
+ if (!TextUtils.isEmpty(cloudInverterDeviceBean.getOmodel())) {
+ gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
+ }
gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
--
Gitblit v1.8.0