From 2c62031554742600f735baf74ea6a5776a1093a9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 22 五月 2024 11:47:40 +0800
Subject: [PATCH] Merge branch 'feature/hxb' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 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 4f54f95..308ffdf 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
@@ -1,5 +1,7 @@
package com.hdl.photovoltaic.ui.bean;
+import android.text.TextUtils;
+
import com.hdl.photovoltaic.R;
import java.io.Serializable;
@@ -13,7 +15,9 @@
private String homeName;//鐢电珯鍚嶇О
private String installedCapacity;//瑁呮満瀹归噺
private String power;//鍙戠數鍔熺巼
- private String todayElectricity;//浠婂ぉ鍙戠數閲�
+ private String todayElectricity;//褰撴棩鍙戠數閲�
+ private String monthElectricity;//褰撴湀鍙戠數閲�
+
private int powerStationStatus;//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
private String localSecret;//鏈湴閫氳绉橀挜
@@ -24,6 +28,11 @@
private boolean state_select = false;//琛ㄧず鏄惁鏄剧ず閫変腑缁勪欢(true鏄剧ず)
+
+ private HouseInfoBean.Location location;//鐢电珯鍦板潃
+
+
+ private String address;//璇︾粏鍦板潃
public boolean isState_select() {
@@ -76,7 +85,7 @@
}
public String getInstalledCapacity() {
- return installedCapacity == null ? "0" : installedCapacity;
+ return TextUtils.isEmpty(installedCapacity) ? "0" : installedCapacity;
}
public void setInstalledCapacity(String installedCapacity) {
@@ -84,7 +93,7 @@
}
public String getPower() {
- return power == null ? "0" : power;
+ return TextUtils.isEmpty(power) ? "0" : power;
}
public void setPower(String power) {
@@ -97,6 +106,14 @@
public void setTodayElectricity(String todayElectricity) {
this.todayElectricity = todayElectricity;
+ }
+
+ public String getMonthElectricity() {
+ return monthElectricity == null ? "" : monthElectricity;
+ }
+
+ public void setMonthElectricity(String monthElectricity) {
+ this.monthElectricity = monthElectricity;
}
public int getPowerStationStatus() {
@@ -115,5 +132,31 @@
this.localSecret = localSecret;
}
+ public HouseInfoBean.Location getLocation() {
+ return location == null ? new HouseInfoBean.Location() : location;
+ }
+ public void setLocation(HouseInfoBean.Location location) {
+ this.location = location;
+ }
+
+ public String getAddress() {
+ return address == null ? "" : address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ /**
+ * 鎷间綇瀹呭湴鍧�
+ *
+ * @return 浣忓畢鍦板潃
+ */
+ public String getHomeAddress() {
+ if (this.location == null) {
+ return this.address;
+ }
+ return this.location.getNationName() + this.location.getProvinceName() + this.location.getCityName() + this.address;
+ }
}
--
Gitblit v1.8.0