From ce3b8953780d1cd77c8781befec6bf7dc22b42b1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 四月 2025 13:12:00 +0800
Subject: [PATCH] 2025年04月22日13:11:57
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 23c31b7..dcc800f 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
@@ -33,7 +33,7 @@
private String systemStatusDesc;//鐘舵��
private String inv;//inv鐘舵��
- private int deviceStatus;//1:寰呮満,2:杩炴帴涓�,3:鏁呴殰,4:杩愯,5:绂荤嚎
+ private int deviceStatus;// 锛� 杩炴帴涓紝2 锛� 鏁呴殰锛�3 锛� 杩愯锛�4 锛� 绂荤嚎
private String addresses;//瀛愮綉鍙�/璁惧鍙�
private List<DeviceAttributeBean> status;
@@ -48,6 +48,16 @@
private String address;//璇︾粏鍦板潃
private HouseInfoBean.Location location;//鐢电珯鍦板潃
private String localSecret;//鎵�灞炵數绔欑殑鏈湴瀵嗛挜
+
+ private boolean ogMaster;//绂荤綉閫嗗彉鍣ㄦ墠杩斿洖
+
+ public boolean isOgMaster() {
+ return ogMaster;
+ }
+
+ public void setOgMaster(boolean ogMaster) {
+ this.ogMaster = ogMaster;
+ }
public String getSystemStatusDesc() {
@@ -117,7 +127,8 @@
}
public String getSid() {
- return sid == null ? "" : sid;
+
+ return TextUtils.isEmpty(sid) ? "" : sid;
}
public void setSid(String sid) {
@@ -269,7 +280,7 @@
if (this.location == null) {
return this.address;
}
- return this.location.getNationName() + this.location.getProvinceName() + this.location.getCityName() + this.address;
+ return this.location.getNationName() + " " + this.location.getProvinceName() + " " + this.location.getCityName() + " " + this.address;
}
public String getHomeNameAndDeviceName() {
--
Gitblit v1.8.0