From ba84a556dc93fcf75e6ec76f999344d3f96ad788 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期五, 02 二月 2024 18:05:24 +0800 Subject: [PATCH] 2024年02月02日18:04:36 --- app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 68 ++++++++++++++++++++++++++++------ 1 files changed, 56 insertions(+), 12 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 7e11fc6..378fd33 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,13 +1,23 @@ 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 { + + /** + * true-鍦ㄧ嚎 + * false-绂荤嚎 + */ + private boolean online; private String gatewayId;//缃戝叧Id - private String gatewayName;//缃戝叧鍚嶇О private String deviceId;//璁惧id private String name;//璁惧鍚嶇О private String spk; @@ -18,10 +28,41 @@ private String osn;//璁惧sn(mac) private String powerPvNow;//鍙戠數鍔熺巼 private String totalElectricityPvToday;//浠婃棩鍙戠數閲� + private String systemStatusDesc;//鐘舵�� + 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; + } + + public void setSystemStatusDesc(String systemStatusDesc) { + this.systemStatusDesc = systemStatusDesc; + } + + public String getHwVersion() { + return hwVersion == null ? "" : hwVersion; + } + + public void setHwVersion(String hwVersion) { + this.hwVersion = hwVersion; + } + + public String getCategorySecondName() { + return categorySecondName == null ? "" : categorySecondName; + } + + public void setCategorySecondName(String categorySecondName) { + this.categorySecondName = categorySecondName; + } + public String getGatewayId() { return gatewayId == null ? "" : gatewayId; @@ -31,13 +72,6 @@ this.gatewayId = gatewayId; } - public String getGatewayName() { - return gatewayName == null ? "" : gatewayName; - } - - public void setGatewayName(String gatewayName) { - this.gatewayName = gatewayName; - } public String getDeviceId() { return deviceId == null ? "" : deviceId; @@ -143,11 +177,21 @@ 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; } + + public boolean isOnline() { + return online; + } + + public void setOnline(boolean online) { + this.online = online; + } + + } -- Gitblit v1.8.0