From 43c0a28db7e43959561036dbde0eb5cb37a7e324 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 10 五月 2024 18:25:40 +0800
Subject: [PATCH] 2024年05月10日18:25:29
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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..c579118 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;
@@ -24,6 +26,11 @@
private boolean state_select = false;//琛ㄧず鏄惁鏄剧ず閫変腑缁勪欢(true鏄剧ず)
+
+ private HouseInfoBean.Location location;//鐢电珯鍦板潃
+
+
+ private String address;//璇︾粏鍦板潃
public boolean isState_select() {
@@ -76,7 +83,7 @@
}
public String getInstalledCapacity() {
- return installedCapacity == null ? "0" : installedCapacity;
+ return TextUtils.isEmpty(installedCapacity) ? "0" : installedCapacity;
}
public void setInstalledCapacity(String installedCapacity) {
@@ -84,7 +91,7 @@
}
public String getPower() {
- return power == null ? "0" : power;
+ return TextUtils.isEmpty(power) ? "0" : power;
}
public void setPower(String power) {
@@ -115,5 +122,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