From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:49:17 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
index 0be3817..972a8e5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
@@ -19,6 +19,39 @@
private String deviceOid;//璁惧oid
private String deviceDesc;//璁惧澶囨敞
+ public String getDescription() {
+ return description == null ? "" : description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getRemark() {
+ return remark == null ? "" : remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getPlan() {
+ return plan == null ? "" : plan;
+ }
+
+ public void setPlan(String plan) {
+ this.plan = plan;
+ }
+
+ private String description;//浜嬩欢鍐呭
+ private String remark;//澶囨敞
+ private String plan;//澶勭悊鏂规
+
+
+ private String deviceType;//璁惧绫诲瀷(INV 锛� 閫嗗彉鍣�, BMS 锛� BMS鎺у埗鐩�, BATTERY 锛� 鐢垫睜鍗曞厓)
+ private String deviceTypeDesc;//璁惧绫诲瀷鎻忚堪
+
+
private String typeDesc;//绫诲瀷鎻忚堪
private String effectScope;//褰卞搷鑼冨洿 NO_EFFECT : 鏃犲奖鍝嶈寖鍥存姤璀�
private String effectScopeDesc;//褰卞搷鑼冨洿鎻忚堪
@@ -26,9 +59,25 @@
private String address;//璇︾粏鍦板潃
- private boolean isRead;//鏄惁宸茬粡璇诲彇
+ private boolean isRead;//鏄惁宸茬粡璇诲彇(true=璇诲彇)
private HouseInfoBean.Location location = new HouseInfoBean.Location();//鐢电珯鍦板潃
+
+ public String getDeviceType() {
+ return deviceType == null ? "" : deviceType;
+ }
+
+ public void setDeviceType(String deviceType) {
+ this.deviceType = deviceType;
+ }
+
+ public String getDeviceTypeDesc() {
+ return deviceTypeDesc == null ? "" : deviceTypeDesc;
+ }
+
+ public void setDeviceTypeDesc(String deviceTypeDesc) {
+ this.deviceTypeDesc = deviceTypeDesc;
+ }
public String getDeviceOidId() {
return deviceOidId == null ? "" : deviceOidId;
@@ -161,4 +210,14 @@
}
+ /**
+ * 鐢电珯瀹屾暣鐨勫湴鍧�
+ *
+ * @return -
+ */
+ public String getLocationAddress() {
+ return location.getNationName() + ">" + location.getProvinceName() + ">" + location.getCityName() + ">" + address;
+ }
+
+
}
--
Gitblit v1.8.0