From b2340ac4ce1c9ea2070c0e7fb72a03fb2b2500ad Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 19 三月 2026 15:27:32 +0800
Subject: [PATCH] 2026年03月19日15:27:21 蓝牙开发中
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 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 373f4f7..3c60903 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
@@ -12,8 +12,6 @@
* 浜戠閫嗗彉鍣ㄥ疄浣撶被
*/
public class CloudInverterDeviceBean implements Serializable {
-
-
/**
* true-鍦ㄧ嚎
* false-绂荤嚎
@@ -40,7 +38,7 @@
private String hwVersion;//杞欢鐗堟湰鍙�
private String categorySecondName;//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О)
- private String deviceType;//(璁惧绫诲瀷INV 锛� 閫嗗彉鍣�,BMS 锛� BMS鎺у埗鐩�,BATTERY 锛� 鐢垫睜鍗曞厓)
+ private String deviceType;//(璁惧绫诲瀷INV 锛� 閫嗗彉鍣�,BMS 锛� BMS鎺у埗鐩�,BATTERY 锛� 鐢垫睜鍗曞厓锛孡OAD_CENTRE 锛氳礋杞芥帶鍒朵腑蹇�)
private String homeId;
private String homeName;
@@ -49,7 +47,47 @@
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锛氭湭婵�娲�)
+
+ private boolean popUpgrade;//鏀硅澶囨槸鍚︽湁寮圭獥鍗囩骇
+ private boolean subPopUpgrade;//涓嬫寕璁惧鏄惁鏈夊脊绐楀崌绾�
+
+ public boolean isSubPopUpgrade() {
+ return subPopUpgrade;
+ }
+
+ public void setSubPopUpgrade(boolean subPopUpgrade) {
+ this.subPopUpgrade = subPopUpgrade;
+ }
+
+ public boolean isPopUpgrade() {
+ return popUpgrade;
+ }
+
+ public void setPopUpgrade(boolean popUpgrade) {
+ this.popUpgrade = popUpgrade;
+ }
+
+ 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;
@@ -127,7 +165,8 @@
}
public String getSid() {
- return sid == null ? "" : sid;
+
+ return TextUtils.isEmpty(sid) ? "" : sid;
}
public void setSid(String sid) {
@@ -277,12 +316,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