From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 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 53b7421..1001175 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,10 +13,24 @@
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;//褰撴湀鍙戠數閲�
+
+
+ private String batteryCapacity;//鐢垫睜瀹归噺
+
+ private String invPower;//閫嗗彉鍣ㄩ瀹氬姛鐜囷紙鍗曚釜閫嗗彉鍣ㄩ瀹氬姛鐜�*閫嗗彉鍣ㄦ暟閲忥級
+
+
+ public String getInvPower() {
+ return invPower == null ? "" : invPower;
+ }
+
+ public void setInvPower(String invPower) {
+ this.invPower = invPower;
+ }
private int powerStationStatus;//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
@@ -33,12 +47,37 @@
private boolean isOtherShare;//鏄笉鏄垎浜殑鐢电珯
private String accountType;//濡傛灉鏄垎浜殑锛屽垎浜殑鏉冮檺绫诲瀷(VIEW 锛� 浠呮煡鐪�,ADMIN 锛� 鏌ョ湅鍔犳帶鍒�)
private boolean debugPerm;//(鏄惁寮�鍚巿鏉冨畨瑁呭晢,鏈紑鍚姸鎬佸畨瑁呬粎鏌ョ湅)
-
private HouseInfoBean.Location location;//鐢电珯鍦板潃
private String address;//璇︾粏鍦板潃
+ /**
+ * 璋冭瘯鐘舵��
+ * Debugging = 璋冭瘯涓�
+ * WAIT_DELIVERED = 璋冭瘯瀹屾垚
+ * Delivered = 宸蹭氦浠�
+ * SECONDARY_DEBUGGIN = 鎺堟潈璋冭瘯
+ */
+ private String debugStatus;
+
+ public String getDebugStatus() {
+ return debugStatus == null ? "" : debugStatus;
+ }
+
+ public void setDebugStatus(String debugStatus) {
+ this.debugStatus = debugStatus;
+ }
+
+
+ public String getBatteryCapacity() {
+ return batteryCapacity == null ? "" : batteryCapacity;
+ }
+
+ public void setBatteryCapacity(String batteryCapacity) {
+ this.batteryCapacity = batteryCapacity;
+ }
+
public String getDeliverStatus() {
return deliverStatus == null ? "" : deliverStatus;
}
--
Gitblit v1.8.0