From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java | 23 ++++++++++++++++++++++-
1 files changed, 22 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 abed74b..d21c488 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,11 @@
private String deviceOid;//璁惧oid
private String deviceDesc;//璁惧澶囨敞
+
+ private String deviceType;//璁惧绫诲瀷(INV 锛� 閫嗗彉鍣�, BMS 锛� BMS鎺у埗鐩�, BATTERY 锛� 鐢垫睜鍗曞厓)
+ private String deviceTypeDesc;//璁惧绫诲瀷鎻忚堪
+
+
private String typeDesc;//绫诲瀷鎻忚堪
private String effectScope;//褰卞搷鑼冨洿 NO_EFFECT : 鏃犲奖鍝嶈寖鍥存姤璀�
private String effectScopeDesc;//褰卞搷鑼冨洿鎻忚堪
@@ -26,10 +31,26 @@
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;
}
--
Gitblit v1.8.0