From 413b905fb1af7f421b801a3d7ad0b84b57e919ab Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 08:54:11 +0800
Subject: [PATCH] 2025年04月15日08:54:09
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 107 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 75 insertions(+), 32 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 93e4fba..bdaec7d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -8,6 +8,7 @@
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.photovoltaic.bean.InverterBean;
import com.hdl.photovoltaic.bean.LocalResponse;
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
@@ -38,6 +39,8 @@
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -290,7 +293,8 @@
* @param whetherToAdd true琛ㄧず鐢ㄥ閲�,false琛ㄧず鐢ㄥ叏閲�
*/
public void uploadOidDataToCloud(String homeId, List<GatewayBean> list, boolean whetherToAdd, CloudCallBeak<Boolean> callBeak) {
- if (list == null || list.size() == 0) {
+
+ if (list == null || list.isEmpty()) {
return;
}
if (whetherToAdd) {
@@ -323,6 +327,7 @@
@Override
public void onError(HDLLinkException e) {
+ HdlLogLogic.print("鑾峰彇oid鍒楄〃澶辫触---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
SystemClock.sleep(200);
@@ -330,10 +335,13 @@
} else {
//鍙湁杩涘叆璇︽儏鐣岄潰
List<OidBean> newOidList = new ArrayList<>();
+ //琛ㄧず涓棿浠讳綍涓�涓け璐ラ兘鏄敼鍙樼敤澧為噺涓婁紶
+ 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>>() {
@@ -341,38 +349,41 @@
public void onSuccess(List<OidBean> oidBeanList) {
atomicInteger.set(atomicInteger.get() + 1);
if (oidBeanList == null) {
+// isIncrementalOidAddition.set(true);
return;
}
newOidList.addAll(oidBeanList);
if (atomicInteger.get() == list.size()) {
- if (newOidList.size() == 0) {
+ 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(), 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 + "---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);
- }
- });
+ @Override
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�(鍏ㄩ噺)---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
+ }
}
}
@@ -380,7 +391,7 @@
public void onError(HDLLinkException e) {
atomicInteger.set(atomicInteger.get() + 1);
if (atomicInteger.get() == list.size()) {
- if (newOidList.size() == 0) {
+ if (newOidList.isEmpty()) {
HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
return;
}
@@ -396,6 +407,8 @@
HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�(澧為噺)---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
+ } else {
+ isIncrementalOidAddition.set(true);
}
}
});
@@ -623,7 +636,11 @@
* @param cloudCallBeak 鍥炶皟update
*/
public void fullUpdateOid(String homeId, List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
- if (oidList == null || oidList.size() == 0) {
+ if (!UserConfigManage.getInstance().getHomeId().equals(homeId)) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�---褰撳墠浣忓畢id:" + UserConfigManage.getInstance().getHomeId() + "---涓婁紶浣忓畢id:" + homeId, true);
+ return;
+ }
+ if (oidList == null || oidList.isEmpty()) {
HdlLogLogic.print("oid鍒楄〃涓虹┖锛屾棤娉曞叏閲忔洿鏂皁id鍒颁簯绔�---", true);
return;
}
@@ -678,6 +695,10 @@
* @param cloudCallBeak 鍥炶皟update
*/
public void updateOidAdd(String homeId, List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
+ if (!UserConfigManage.getInstance().getHomeId().equals(homeId)) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�---褰撳墠浣忓畢id:" + UserConfigManage.getInstance().getHomeId() + "---涓婁紶浣忓畢id:" + homeId, true);
+ return;
+ }
if (oidList == null || oidList.size() == 0) {
HdlLogLogic.print("oid鍒楄〃涓虹┖锛屾棤娉曞閲忔坊鍔爋id鍒颁簯绔�---", true);
return;
@@ -688,6 +709,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());
@@ -910,7 +935,7 @@
* @param mac 缃戝叧mac
* @param linkCallBack 鍥炶皟
*/
- public void getGatewayInfo(String mac, LinkCallBack<GatewayBean> linkCallBack) {
+ public void getGatewayInfo(String mac, LinkCallBack<InverterBean> linkCallBack) {
String requestUrl = TopicApi.GET_GATEWAY_INFO;
JsonObject json = new JsonObject();
json.addProperty("device_mac", mac);
@@ -926,11 +951,11 @@
}
Gson gson = new Gson();
- Type typeOfT = new TypeToken<BaseLocalResponse<GatewayBean>>() {
+ Type typeOfT = new TypeToken<BaseLocalResponse<InverterBean>>() {
}.getType();
- BaseLocalResponse<GatewayBean> baseLocalResponse = gson.fromJson(json, typeOfT);
+ BaseLocalResponse<InverterBean> baseLocalResponse = gson.fromJson(json, typeOfT);
if (baseLocalResponse == null || baseLocalResponse.getObjects() == null) {
- linkCallBack.onSuccess(new GatewayBean());
+ linkCallBack.onSuccess(new InverterBean());
} else {
linkCallBack.onSuccess(baseLocalResponse.getObjects());
}
@@ -1131,7 +1156,7 @@
List<String> removeSidList = new ArrayList<>();
for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
- if (gatewayBean.getSpk().equals(INVERTER_DEVICE_SPK)) {
+ if (!isLoadCenterSpk(gatewayBean.getSpk())) {
//涓嶆槸璐熻浇涓績鐨剆pk涓嶅仛澶勭悊锛�
continue;
}
@@ -1347,6 +1372,16 @@
if (gatewayBean != null) {
HDLLinkLocalGateway.getInstance().getGatewayList().remove(gatewayBean);
}
+ }
+
+ /**
+ * 鍒ゆ柇spk鏄惁鏄礋杞戒腑蹇�
+ *
+ * @param spk spk
+ * @return 鐪�=true锛屽惁鍒欒繑鍥瀎alse
+ */
+ private boolean isLoadCenterSpk(String spk) {
+ return Objects.equals(spk, LC_SPK);
}
/**
@@ -1720,6 +1755,9 @@
gatewayBean.setDevice_name(cloudInverterDeviceBean.getName());//璁惧鍚嶇О
gatewayBean.setGatewayType(cloudInverterDeviceBean.getSpk());//璁剧疆spk
gatewayBean.setLocalEncrypt(true);
+ //绂荤綉閫嗗彉鍣�
+ gatewayBean.setOgMaster(cloudInverterDeviceBean.isOgMaster());
+ //閫嗗彉鍣�
gatewayBean.setMaster(GatewayMasterType.MasterTrue);//榛樿閮芥槸涓婚�嗗彉鍣�(浠ュ悗鏀寔浠庨�嗗彉鍣ㄨ鏇存敼)
gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵��
gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙�
@@ -1748,6 +1786,7 @@
List<String> spks = new ArrayList<>();
spks.add(INVERTER_DEVICE_SPK);
spks.add(LC_SPK);
+ spks.add(OFF_INVERTER_OG_SPK);
return spks;
}
@@ -1771,4 +1810,8 @@
* 璐熻浇涓績spk
*/
public final String LC_SPK = "energy.hdl_lc";
+ /**
+ * 绂荤嚎閫嗗彉鍣╯pk
+ */
+ public final String OFF_INVERTER_OG_SPK = "energy.inverter_og";
}
--
Gitblit v1.8.0