From 2225b1f0727fb74e10ac5692e68e4cd48f4f62d7 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 03 三月 2025 15:02:14 +0800
Subject: [PATCH] 2025年03月03日15:02:11
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 f5eb2c4..2f1d14c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -39,6 +39,7 @@
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
@@ -1132,7 +1133,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;
}
@@ -1348,6 +1349,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);
}
/**
@@ -1721,6 +1732,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());//杞欢鐗堟湰鍙�
@@ -1749,6 +1763,7 @@
List<String> spks = new ArrayList<>();
spks.add(INVERTER_DEVICE_SPK);
spks.add(LC_SPK);
+ spks.add(OFF_INVERTER_OG_SPK);
return spks;
}
@@ -1772,4 +1787,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