From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:49:17 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 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 dcc800f..148f233 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
@@ -49,7 +49,28 @@
private HouseInfoBean.Location location;//鐢电珯鍦板潃
private String localSecret;//鎵�灞炵數绔欑殑鏈湴瀵嗛挜
+ public boolean isActivate() {
+ return activate;
+ }
+
+ public void setActivate(boolean activate) {
+ this.activate = activate;
+ }
+
+ private boolean activate;//鏄惁婵�娲昏澶�(true锛氭縺娲伙紱false锛氭湭婵�娲�)
+
+ public String getWorkStatusDesc() {
+ return workStatusDesc==null?"":this.workStatusDesc;
+ }
+
+ public void setWorkStatusDesc(String workStatusDesc) {
+ this.workStatusDesc = workStatusDesc;
+ }
+
+ private String workStatusDesc;//宸ヤ綔鐘舵�侊紙璐熻浇涓績璁惧锛�
+
private boolean ogMaster;//绂荤綉閫嗗彉鍣ㄦ墠杩斿洖
+
public boolean isOgMaster() {
return ogMaster;
@@ -278,12 +299,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