From 907561d0b92252c352c4355bc1c194c4658b6836 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 15:08:06 +0800
Subject: [PATCH] 2025年07月31日15:08:04
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 8c468ae..679940a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -2518,14 +2518,25 @@
}
List<GatewayBean> newList = new ArrayList<>();
List<GatewayBean> inverterList = new ArrayList<>();
+ List<GatewayBean> inverterUnactivatedList = new ArrayList<>();
List<GatewayBean> lcList = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
- if (list.get(i).getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)) {
- inverterList.add(list.get(i));
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean == null) {
+ continue;
+ }
+ if (gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)
+ || gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().OFF_INVERTER_OG_SPK)) {
+ if (gatewayBean.isActivate()) {
+ inverterList.add(gatewayBean);
+ } else {
+ inverterUnactivatedList.add(gatewayBean);
+ }
} else {
- lcList.add(list.get(i));
+ lcList.add(gatewayBean);
}
}
+ newList.addAll(inverterUnactivatedList);
newList.addAll(inverterList);
newList.addAll(lcList);
return newList;
@@ -2731,6 +2742,7 @@
inverterDeviceBean.setDeviceStatus(gatewayBean.getDeviceStatus());
inverterDeviceBean.setSpk(gatewayBean.getSpk());
inverterDeviceBean.setDeviceType(gatewayBean.getDeviceType());
+ inverterDeviceBean.setActivate(gatewayBean.isActivate());
newList.add(inverterDeviceBean);
}
}
--
Gitblit v1.8.0