From 46f45f42abf00acf70e8160e73faa71aec3df13d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 01 七月 2024 13:46:30 +0800
Subject: [PATCH] 2024年07月01日13:46:18

---
 app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java |   85 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 82 insertions(+), 3 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..53b7421 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;
@@ -13,7 +15,9 @@
     private String homeName;//鐢电珯鍚嶇О
     private String installedCapacity;//瑁呮満瀹归噺
     private String power;//鍙戠數鍔熺巼
-    private String todayElectricity;//浠婂ぉ鍙戠數閲�
+    private String todayElectricity;//褰撴棩鍙戠數閲�
+    private String monthElectricity;//褰撴湀鍙戠數閲�
+
 
     private int powerStationStatus;//鐢电珯鐘舵��(鐢电珯鐘舵��	1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
     private String localSecret;//鏈湴閫氳绉橀挜
@@ -25,6 +29,47 @@
 
     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;//璇︾粏鍦板潃
+
+    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;
@@ -76,7 +121,7 @@
     }
 
     public String getInstalledCapacity() {
-        return installedCapacity == null ? "0" : installedCapacity;
+        return TextUtils.isEmpty(installedCapacity) ? "0" : installedCapacity;
     }
 
     public void setInstalledCapacity(String installedCapacity) {
@@ -84,7 +129,7 @@
     }
 
     public String getPower() {
-        return power == null ? "0" : power;
+        return TextUtils.isEmpty(power) ? "0" : power;
     }
 
     public void setPower(String power) {
@@ -97,6 +142,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() {
@@ -115,5 +168,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