From 8814f3f0828e6ac652a29cc9de9f971fd55bca5b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 14:54:42 +0800
Subject: [PATCH] 2025年05月07日14:54:39

---
 app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 106 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
index 2f7ae08..9fb4a5a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
@@ -1,5 +1,7 @@
 package com.hdl.photovoltaic.ui.bean;
 
+import android.text.TextUtils;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,12 +33,42 @@
     private String systemStatusDesc;//鐘舵��
 
     private String inv;//inv鐘舵��
-    private int deviceStatus;//1:寰呮満,2:杩炴帴涓�,3:鏁呴殰,4:杩愯,5:绂荤嚎
+    private int deviceStatus;// 锛� 杩炴帴涓紝2 锛� 鏁呴殰锛�3 锛� 杩愯锛�4 锛� 绂荤嚎
     private String addresses;//瀛愮綉鍙�/璁惧鍙�
     private List<DeviceAttributeBean> status;
 
     private String hwVersion;//杞欢鐗堟湰鍙�
     private String categorySecondName;//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О)
+
+    private String deviceType;//(璁惧绫诲瀷INV 锛� 閫嗗彉鍣�,BMS 锛� BMS鎺у埗鐩�,BATTERY 锛� 鐢垫睜鍗曞厓)
+
+    private String homeId;
+    private String homeName;
+    private String outputActivePower;//閫嗗彉鍣ㄨ緭鍑烘湁鍔熷姛鐜�
+    private String address;//璇︾粏鍦板潃
+    private HouseInfoBean.Location location;//鐢电珯鍦板潃
+    private String localSecret;//鎵�灞炵數绔欑殑鏈湴瀵嗛挜
+
+    public String getWorkStatusDesc() {
+        return workStatusDesc==null?"":this.workStatusDesc;
+    }
+
+    public void setWorkStatusDesc(String workStatusDesc) {
+        this.workStatusDesc = workStatusDesc;
+    }
+
+    private String workStatusDesc;//宸ヤ綔鐘舵�侊紙璐熻浇涓績璁惧锛�
+
+    private boolean ogMaster;//绂荤綉閫嗗彉鍣ㄦ墠杩斿洖
+
+
+    public boolean isOgMaster() {
+        return ogMaster;
+    }
+
+    public void setOgMaster(boolean ogMaster) {
+        this.ogMaster = ogMaster;
+    }
 
 
     public String getSystemStatusDesc() {
@@ -106,7 +138,8 @@
     }
 
     public String getSid() {
-        return sid == null ? "" : sid;
+
+        return TextUtils.isEmpty(sid) ? "" : sid;
     }
 
     public void setSid(String sid) {
@@ -130,7 +163,7 @@
     }
 
     public String getOsn() {
-        return osn == null ? "" : "SN:" + osn;
+        return osn == null ? "" : osn;
     }
 
     public void setOsn(String osn) {
@@ -193,5 +226,75 @@
         this.online = online;
     }
 
+    public String getDeviceType() {
+        return deviceType == null ? "" : deviceType;
+    }
 
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getHomeId() {
+        return TextUtils.isEmpty(homeId) ? "" : homeId;
+    }
+
+    public void setHomeId(String homeId) {
+        this.homeId = homeId;
+    }
+
+    public String getHomeName() {
+        return TextUtils.isEmpty(homeName) ? "" : homeName;
+    }
+
+    public void setHomeName(String homeName) {
+        this.homeName = homeName;
+    }
+
+    public String getOutputActivePower() {
+        return TextUtils.isEmpty(outputActivePower) ? "" : outputActivePower;
+    }
+
+    public void setOutputActivePower(String outputActivePower) {
+        this.outputActivePower = outputActivePower;
+    }
+
+    public String getAddress() {
+        return TextUtils.isEmpty(address) ? "" : address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public HouseInfoBean.Location getLocation() {
+        return location;
+    }
+
+    public void setLocation(HouseInfoBean.Location location) {
+        this.location = location;
+    }
+
+    public String getLocalSecret() {
+        return localSecret == null ? "" : this.localSecret;
+    }
+
+    public void setLocalSecret(String localSecret) {
+        this.localSecret = localSecret;
+    }
+
+    /**
+     * 鎷间綇瀹呭湴鍧�
+     *
+     * @return 浣忓畢鍦板潃
+     */
+    public String getHomeAddress() {
+        if (this.location == null) {
+            return this.getAddress();
+        }
+        return this.location.getNationName() + " " + this.location.getProvinceName() + " " + this.location.getCityName() + " " + this.getAddress();
+    }
+
+    public String getHomeNameAndDeviceName() {
+        return this.getHomeName() + "_" + this.getName();
+    }
 }

--
Gitblit v1.8.0