From e6a0ff5475e271a6b126ab27de6cf9f230b67512 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 23 四月 2025 15:29:29 +0800
Subject: [PATCH] 2025年04月23日15:29:27
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 b6899ff..142dedb 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
@@ -48,15 +48,16 @@
private String address;//璇︾粏鍦板潃
private HouseInfoBean.Location location;//鐢电珯鍦板潃
private String localSecret;//鎵�灞炵數绔欑殑鏈湴瀵嗛挜
- private boolean master;//绂荤綉閫嗗彉鍣ㄦ墠杩斿洖
- public boolean isMaster() {
- return master;
+
+ private boolean ogMaster;//绂荤綉閫嗗彉鍣ㄦ墠杩斿洖
+
+ public boolean isOgMaster() {
+ return ogMaster;
}
- public void setMaster(boolean master) {
- this.master = master;
+ public void setOgMaster(boolean ogMaster) {
+ this.ogMaster = ogMaster;
}
-
public String getSystemStatusDesc() {
@@ -126,7 +127,8 @@
}
public String getSid() {
- return sid == null ? "" : sid;
+
+ return TextUtils.isEmpty(sid) ? "" : sid;
}
public void setSid(String sid) {
@@ -276,12 +278,12 @@
*/
public String getHomeAddress() {
if (this.location == null) {
- return this.address;
+ return this.getAddress();
}
- return this.location.getNationName() + this.location.getProvinceName() + this.location.getCityName() + this.address;
+ return this.location.getNationName() + " " + this.location.getProvinceName() + " " + this.location.getCityName() + " " + this.getAddress();
}
public String getHomeNameAndDeviceName() {
- return homeName + "_" + this.getName();
+ return this.getHomeName() + "_" + this.getName();
}
}
--
Gitblit v1.8.0