From 971a24a9e58a21bc306897fd3ad63012a399f7db Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 23 五月 2025 14:07:18 +0800
Subject: [PATCH] Merge branch '1.2.1' into 1.2.0_google
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 157 insertions(+), 5 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 358c394..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
@@ -1,5 +1,7 @@
package com.hdl.photovoltaic.ui.bean;
+import android.text.TextUtils;
+
import com.hdl.photovoltaic.R;
import java.io.Serializable;
@@ -11,11 +13,127 @@
private String homeId;//鐢电珯id
private String powerStationImage;//鐢电珯鍥剧墖
private String homeName;//鐢电珯鍚嶇О
- private String installedCapacity;//瑁呮満瀹归噺
+ private String installedCapacity;//缁勪覆瀹归噺(鍒涘缓鐢电珯鏃惰緭鍏ョ殑缁勪覆瀹归噺)
private String power;//鍙戠數鍔熺巼
- private String todayElectricity;//浠婂ぉ鍙戠數閲�
- private int powerStationStatus;//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
+ 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:鏁呴殰,5:绂荤嚎鏈夋晠闅�,6:閮ㄥ垎绂荤嚎)
private String localSecret;//鏈湴閫氳绉橀挜
+
+ private boolean isMove = false;//琛ㄧず鏄惁鏄剧ず绉诲姩缁勪欢(true鏄剧ず)
+
+ private boolean isDelIcon = false;//琛ㄧず鏄惁鏄剧ず鍒犻櫎缁勪欢(true鏄剧ず)
+
+
+ private boolean state_select = false;//琛ㄧず鏄惁鏄剧ず閫変腑缁勪欢(true鏄剧ず)
+
+ private String deliverStatus;//(PAID锛氬凡浜や粯 ;UNDELIVERED 锛氭湭浜や粯)
+ 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;
+ }
+
+ public void setDeliverStatus(String deliverStatus) {
+ this.deliverStatus = deliverStatus;
+ }
+
+ public boolean isOtherShare() {
+ return isOtherShare;
+ }
+
+ public void setOtherShare(boolean otherShare) {
+ isOtherShare = otherShare;
+ }
+
+ public String getAccountType() {
+ return accountType == null ? "" : accountType;
+ }
+
+ public void setAccountType(String accountType) {
+ this.accountType = accountType;
+ }
+
+ public boolean isDebugPerm() {
+ return debugPerm;
+ }
+
+ public void setDebugPerm(boolean debugPerm) {
+ this.debugPerm = debugPerm;
+ }
+
+ public boolean isState_select() {
+ return state_select;
+ }
+
+ public void setState_select(boolean state_select) {
+ this.state_select = state_select;
+ }
+
+ public boolean isDelIcon() {
+ return isDelIcon;
+ }
+
+ public void setDelIcon(boolean delIcon) {
+ isDelIcon = delIcon;
+ }
+
+
+ public boolean isMove() {
+ return isMove;
+ }
+
+ public void setMove(boolean edit) {
+ isMove = edit;
+ }
public String getHomeId() {
return homeId == null ? "" : homeId;
@@ -42,7 +160,7 @@
}
public String getInstalledCapacity() {
- return installedCapacity == null ? "0" : installedCapacity;
+ return TextUtils.isEmpty(installedCapacity) ? "0" : installedCapacity;
}
public void setInstalledCapacity(String installedCapacity) {
@@ -50,7 +168,7 @@
}
public String getPower() {
- return power == null ? "0" : power;
+ return TextUtils.isEmpty(power) ? "0" : power;
}
public void setPower(String power) {
@@ -63,6 +181,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() {
@@ -81,5 +207,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.getAddress();
+ }
+ return this.location.getNationName() +" "+ this.location.getProvinceName() +" "+ this.location.getCityName() +" "+ this.getAddress();
+ }
}
--
Gitblit v1.8.0