From 50101e1b1c152c5346a6f4e63a7c6db98809e4d9 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 15:02:42 +0800
Subject: [PATCH] 2024年05月22日15:02:36
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceBean.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceBean.java
index 72f73f0..b42595f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceBean.java
@@ -11,7 +11,6 @@
private String homeId;
private String homeName;
- private String deviceType;//璁惧绫诲瀷(INV閫嗗彉鍣紝BMS鎺у埗鐩�,BATTERY鐢垫睜鍗曞厓)
private String outputActivePower;//閫嗗彉鍣ㄨ緭鍑烘湁鍔熷姛鐜�
private String address;//璇︾粏鍦板潃
private HouseInfoBean.Location location;//鐢电珯鍦板潃
@@ -56,13 +55,7 @@
this.location = location;
}
- public String getDeviceType() {
- return TextUtils.isEmpty(deviceType) ? "" : deviceType;
- }
- public void setDeviceType(String deviceType) {
- this.deviceType = deviceType;
- }
/**
* 鎷间綇瀹呭湴鍧�
*
@@ -75,4 +68,8 @@
return this.location.getNationName() + this.location.getProvinceName() + this.location.getCityName() + this.address;
}
+ public String getHomeNameAndDeviceName() {
+ return homeName + "_" + this.getName();
+ }
+
}
--
Gitblit v1.8.0