From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:49:17 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 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 4d05464..d39800e 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
@@ -11,9 +11,12 @@
*/
public class HouseIdBean implements Serializable {
private String homeId;//鐢电珯id
+ private String debugType="NORMAL";//璋冭瘯绫诲瀷(NORMAL =甯歌璋冭瘯;SIMPLE =绠�鏄撹皟璇�)
+ private String communityId="";//椤圭洰id
+ private String flowRecordContent="";//娴佽浆璁板綍鍐呭
private String powerStationImage;//鐢电珯鍥剧墖
private String homeName;//鐢电珯鍚嶇О
- private String installedCapacity;//瑁呮満瀹归噺
+ private String installedCapacity;//缁勪覆瀹归噺(鍒涘缓鐢电珯鏃惰緭鍏ョ殑缁勪覆瀹归噺)
private String power;//鍙戠數鍔熺巼
private String todayElectricity;//褰撴棩鍙戠數閲�
private String monthElectricity;//褰撴湀鍙戠數閲�
@@ -21,8 +24,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鏄剧ず)
@@ -40,6 +54,46 @@
private String address;//璇︾粏鍦板潃
+
+ /**
+ * 璋冭瘯鐘舵��
+ * Debugging = 璋冭瘯涓�
+ * WAIT_DELIVERED = 璋冭瘯瀹屾垚
+ * Delivered = 宸蹭氦浠�
+ * SECONDARY_DEBUGGIN = 鎺堟潈璋冭瘯
+ */
+ private String debugStatus;
+ public String getDebugType() {
+ return debugType;
+ }
+
+ public void setDebugType(String debugType) {
+ this.debugType = debugType;
+ }
+
+ public String getCommunityId() {
+ return communityId;
+ }
+
+ public void setCommunityId(String communityId) {
+ this.communityId = communityId;
+ }
+
+ public String getFlowRecordContent() {
+ return flowRecordContent;
+ }
+
+ public void setFlowRecordContent(String flowRecordContent) {
+ this.flowRecordContent = flowRecordContent;
+ }
+ public String getDebugStatus() {
+ return debugStatus == null ? "" : debugStatus;
+ }
+
+ public void setDebugStatus(String debugStatus) {
+ this.debugStatus = debugStatus;
+ }
+
public String getBatteryCapacity() {
return batteryCapacity == null ? "" : batteryCapacity;
@@ -201,8 +255,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