From 4598b51c90c695c9ccbe5350a84e4a46b9d8e587 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 20:19:02 +0800
Subject: [PATCH] 2024年05月22日20:18:54
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 142 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 129 insertions(+), 13 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..d1a5959 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,25 @@
package com.hdl.photovoltaic.ui.bean;
+import android.text.TextUtils;
+
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 +30,48 @@
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 String addresses;//瀛愮綉鍙�/璁惧鍙�
+ private List<DeviceAttributeBean> status;
+
+ private String hwVersion;//杞欢鐗堟湰鍙�
+ private String categorySecondName;//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О)
+
+ private String deviceType;//(璁惧绫诲瀷INV 锛� 閫嗗彉鍣�,BMS 锛� BMS鎺у埗鐩�,BATTERY 锛� 鐢垫睜鍗曞厓)
+
+ private String homeId;
+ private String homeName;
+ private String outputActivePower;//閫嗗彉鍣ㄨ緭鍑烘湁鍔熷姛鐜�
+ private String address;//璇︾粏鍦板潃
+ private HouseInfoBean.Location location;//鐢电珯鍦板潃
+
+ 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 +81,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 +186,84 @@
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;
+ }
+
+ public String getDeviceType() {
+ return deviceType == null ? "" : deviceType;
+ }
+
+ public void setDeviceType(String deviceType) {
+ this.deviceType = deviceType;
+ }
+
+ public String getHomeId() {
+ return TextUtils.isEmpty(homeId) ? "" : homeId;
+ }
+
+ public void setHomeId(String homeId) {
+ this.homeId = homeId;
+ }
+
+ public String getHomeName() {
+ return TextUtils.isEmpty(homeName) ? "" : homeName;
+ }
+
+ public void setHomeName(String homeName) {
+ this.homeName = homeName;
+ }
+
+ public String getOutputActivePower() {
+ return TextUtils.isEmpty(outputActivePower) ? "" : outputActivePower;
+ }
+
+ public void setOutputActivePower(String outputActivePower) {
+ this.outputActivePower = outputActivePower;
+ }
+
+ public String getAddress() {
+ return TextUtils.isEmpty(address) ? "" : address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public HouseInfoBean.Location getLocation() {
+ return location;
+ }
+
+ public void setLocation(HouseInfoBean.Location location) {
+ this.location = location;
+ }
+
+
+ /**
+ * 鎷间綇瀹呭湴鍧�
+ *
+ * @return 浣忓畢鍦板潃
+ */
+ public String getHomeAddress() {
+ if (this.location == null) {
+ return this.address;
+ }
+ return this.location.getNationName() + this.location.getProvinceName() + this.location.getCityName() + this.address;
+ }
+
+ public String getHomeNameAndDeviceName() {
+ return homeName + "_" + this.getName();
+ }
}
--
Gitblit v1.8.0