From 542a1aebe872632e69b4a42ff629d13bb4e8d6d0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 七月 2025 09:31:14 +0800
Subject: [PATCH] Merge branch '1.3.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 c81b539..5a0d354 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
@@ -13,7 +13,7 @@
private String homeId;//鐢电珯id
private String powerStationImage;//鐢电珯鍥剧墖
private String homeName;//鐢电珯鍚嶇О
- private String installedCapacity;//瑁呮満瀹归噺
+ private String installedCapacity;//缁勪覆瀹归噺(鍒涘缓鐢电珯鏃惰緭鍏ョ殑缁勪覆瀹归噺)
private String power;//鍙戠數鍔熺巼
private String todayElectricity;//褰撴棩鍙戠數閲�
private String monthElectricity;//褰撴湀鍙戠數閲�
@@ -21,8 +21,19 @@
private String batteryCapacity;//鐢垫睜瀹归噺
+ private String invPower;//閫嗗彉鍣ㄩ瀹氬姛鐜囷紙鍗曚釜閫嗗彉鍣ㄩ瀹氬姛鐜�*閫嗗彉鍣ㄦ暟閲忥級
- private int powerStationStatus;//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
+
+ public String getInvPower() {
+ return invPower == null ? "" : invPower;
+ }
+
+ public void setInvPower(String invPower) {
+ this.invPower = invPower;
+ }
+
+
+ private int powerStationStatus;//鐢电珯鐘舵��(1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰,5:绂荤嚎鏈夋晠闅�,6:閮ㄥ垎绂荤嚎)
private String localSecret;//鏈湴閫氳绉橀挜
private boolean isMove = false;//琛ㄧず鏄惁鏄剧ず绉诲姩缁勪欢(true鏄剧ず)
@@ -219,8 +230,8 @@
*/
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();
}
}
--
Gitblit v1.8.0