From a59bbb7890e107a681f677765f2600e278c06a0d Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 09 十月 2023 10:16:37 +0800 Subject: [PATCH] 2023年10月09日10:16:35 --- app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java index b86b787..f60369f 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java @@ -1,7 +1,9 @@ package com.hdl.photovoltaic.ui.bean; import java.io.Serializable; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; public class CloudInverterDeviceBean implements Serializable { @@ -29,13 +31,13 @@ private String inv;//inv鐘舵�� private int deviceStatus;//1:寰呮満,2:杩炴帴涓�,3:鏁呴殰,4:杩愯,5:绂荤嚎 private String addresses; - private Map<String, String> status; + private List<DeviceAttributeBean> status; private String hwVersion;//杞欢鐗堟湰鍙� private String categorySecondName;//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О) public String getSystemStatusDesc() { - return systemStatusDesc== null ? "" :systemStatusDesc; + return systemStatusDesc == null ? "" : systemStatusDesc; } public void setSystemStatusDesc(String systemStatusDesc) { @@ -43,7 +45,7 @@ } public String getHwVersion() { - return hwVersion== null ? "" :hwVersion; + return hwVersion == null ? "" : hwVersion; } public void setHwVersion(String hwVersion) { @@ -51,7 +53,7 @@ } public String getCategorySecondName() { - return categorySecondName== null ? "" :categorySecondName; + return categorySecondName == null ? "" : categorySecondName; } public void setCategorySecondName(String categorySecondName) { @@ -179,11 +181,11 @@ this.addresses = addresses; } - public Map<String, String> getStatus() { - return status == null ? new HashMap<>() : status; + public List<DeviceAttributeBean> getStatus() { + return status == null ? new ArrayList<>() : status; } - public void setStatus(Map<String, String> status) { + public void setStatus(List<DeviceAttributeBean> status) { this.status = status; } @@ -194,4 +196,6 @@ public void setOnline(boolean online) { this.online = online; } + + } -- Gitblit v1.8.0