From 788c70114287306db20e9a4539018d6e32fb5cb7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 19 四月 2024 10:10:10 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
index 38cd53a..4f54f95 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
@@ -14,8 +14,42 @@
private String installedCapacity;//瑁呮満瀹归噺
private String power;//鍙戠數鍔熺巼
private String todayElectricity;//浠婂ぉ鍙戠數閲�
+
private int powerStationStatus;//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
private String localSecret;//鏈湴閫氳绉橀挜
+
+ private boolean isMove = false;//琛ㄧず鏄惁鏄剧ず绉诲姩缁勪欢(true鏄剧ず)
+
+ private boolean isDelIcon = false;//琛ㄧず鏄惁鏄剧ず鍒犻櫎缁勪欢(true鏄剧ず)
+
+
+ private boolean state_select = false;//琛ㄧず鏄惁鏄剧ず閫変腑缁勪欢(true鏄剧ず)
+
+
+ public boolean isState_select() {
+ return state_select;
+ }
+
+ public void setState_select(boolean state_select) {
+ this.state_select = state_select;
+ }
+
+ public boolean isDelIcon() {
+ return isDelIcon;
+ }
+
+ public void setDelIcon(boolean delIcon) {
+ isDelIcon = delIcon;
+ }
+
+
+ public boolean isMove() {
+ return isMove;
+ }
+
+ public void setMove(boolean edit) {
+ isMove = edit;
+ }
public String getHomeId() {
return homeId == null ? "" : homeId;
@@ -42,7 +76,7 @@
}
public String getInstalledCapacity() {
- return installedCapacity == null ? "" : installedCapacity;
+ return installedCapacity == null ? "0" : installedCapacity;
}
public void setInstalledCapacity(String installedCapacity) {
@@ -50,7 +84,7 @@
}
public String getPower() {
- return power == null ? "" : power;
+ return power == null ? "0" : power;
}
public void setPower(String power) {
@@ -80,7 +114,6 @@
public void setLocalSecret(String localSecret) {
this.localSecret = localSecret;
}
-
}
--
Gitblit v1.8.0