From 788c70114287306db20e9a4539018d6e32fb5cb7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 19 四月 2024 10:10:10 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new

---
 app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java |   63 ++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 7 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 427f308..4f54f95 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,15 +1,55 @@
 package com.hdl.photovoltaic.ui.bean;
 
+import com.hdl.photovoltaic.R;
+
 import java.io.Serializable;
 
+/**
+ * 鐢电珯Id瀹炰綋绫�
+ */
 public class HouseIdBean implements Serializable {
     private String homeId;//鐢电珯id
-    private String homeImage;//鐢电珯鍥剧墖
+    private String powerStationImage;//鐢电珯鍥剧墖
     private String homeName;//鐢电珯鍚嶇О
     private String installedCapacity;//瑁呮満瀹归噺
     private String power;//鍙戠數鍔熺巼
     private String todayElectricity;//浠婂ぉ鍙戠數閲�
+
     private int powerStationStatus;//鐢电珯鐘舵��(鐢电珯鐘舵��	1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
+    private String localSecret;//鏈湴閫氳绉橀挜
+
+    private boolean isMove = false;//琛ㄧず鏄惁鏄剧ず绉诲姩缁勪欢(true鏄剧ず)
+
+    private boolean isDelIcon = false;//琛ㄧず鏄惁鏄剧ず鍒犻櫎缁勪欢(true鏄剧ず)
+
+
+    private boolean state_select = false;//琛ㄧず鏄惁鏄剧ず閫変腑缁勪欢(true鏄剧ず)
+
+
+    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;
@@ -19,12 +59,12 @@
         this.homeId = homeId;
     }
 
-    public String getHomeImage() {
-        return homeImage == null ? "" : homeImage;
+    public String getPowerStationImage() {
+        return powerStationImage == null ? "" : powerStationImage;
     }
 
-    public void setHomeImage(String homeImage) {
-        this.homeImage = homeImage;
+    public void setPowerStationImage(String homeImage) {
+        this.powerStationImage = homeImage;
     }
 
     public String getHomeName() {
@@ -36,7 +76,7 @@
     }
 
     public String getInstalledCapacity() {
-        return installedCapacity == null ? "" : installedCapacity;
+        return installedCapacity == null ? "0" : installedCapacity;
     }
 
     public void setInstalledCapacity(String installedCapacity) {
@@ -44,7 +84,7 @@
     }
 
     public String getPower() {
-        return power == null ? "" : power;
+        return power == null ? "0" : power;
     }
 
     public void setPower(String power) {
@@ -67,4 +107,13 @@
         this.powerStationStatus = powerStationStatus;
     }
 
+    public String getLocalSecret() {
+        return localSecret == null ? "" : localSecret;
+    }
+
+    public void setLocalSecret(String localSecret) {
+        this.localSecret = localSecret;
+    }
+
+
 }

--
Gitblit v1.8.0