From 770c89ab981b7659faabf8a812a25d99a11bdebf Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 16 四月 2026 08:40:43 +0800
Subject: [PATCH] 2026年04月16日08:40:19
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 95 insertions(+), 5 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 3c60903..5e19545 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
@@ -2,6 +2,8 @@
import android.text.TextUtils;
+import com.hdl.sdk.link.core.bean.gateway.FwVersionBean;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
@@ -25,7 +27,12 @@
private String sid;
private String oid;
private String omodel;//璁惧鍨嬪彿
+ private String deviceModel;//璁惧鍨嬪彿锛坆ms璁惧锛�
+ private String deviceOidId;//璁惧浜戠涓妎id锛坆ms璁惧锛�
+
private String osn;//璁惧sn(mac)
+
+ private String mac;//锛坆ms璁惧mac锛�,鍚庨潰缁熶竴鏀规垚mac
private String powerPvNow;//鍙戠數鍔熺巼
private String totalElectricityPvToday;//浠婃棩鍙戠數閲�
private String systemStatusDesc;//鐘舵��
@@ -47,6 +54,70 @@
private HouseInfoBean.Location location;//鐢电珯鍦板潃
private String localSecret;//鎵�灞炵數绔欑殑鏈湴瀵嗛挜
+ private List<FwVersionBean> fwVersion = new ArrayList<>();//BMS璁惧鎵嶆湁鐨勫浐浠剁増鏈�
+ private String chargeToday;//浠婃棩鍏呯數閲忥紝BMS璁惧鎵嶆湁鐨�
+ private String dischargeToday;//浠婃棩鏀剧數閲忥紝BMS璁惧鎵嶆湁鐨�
+ private String bmsSource;//閫嗗彉鍣ㄧ殑BMS绫诲瀷 鍐呴儴鐨勮繕鏄閮ㄧ殑 ;鐩墠绂荤綉閫嗗彉鍣ㄦ墠鏈� 鍐呴儴锛欼NTERNAL 澶栭儴锛欵XTERNAL 濡傛灉娌℃湁鍊煎綋鍐呴儴鐨勫鐞�
+
+ public String getBmsSource() {
+ return bmsSource == null ? "" : bmsSource;
+ }
+
+ public void setBmsSource(String bmsSource) {
+ this.bmsSource = bmsSource;
+ }
+
+ /**
+ * 浠婃棩鍏呯數閲忥紝BMS璁惧鎵嶆湁鐨�
+ *
+ * @return
+ */
+ public String getChargeToday() {
+ return chargeToday == null ? "" : chargeToday;
+ }
+
+
+ public void setChargeToday(String chargeToday) {
+ this.chargeToday = chargeToday;
+ }
+
+ /**
+ * 浠婃棩鏀剧數閲忥紝BMS璁惧鎵嶆湁鐨�
+ *
+ * @param
+ */
+ public String getDischargeToday() {
+ return dischargeToday == null ? "" : dischargeToday;
+ }
+
+ public void setDischargeToday(String dischargeToday) {
+ this.dischargeToday = dischargeToday;
+ }
+
+ public String getDeviceModel() {
+ return deviceModel == null ? "" : deviceModel;
+ }
+
+ public void setDeviceModel(String deviceModel) {
+ this.deviceModel = deviceModel;
+ }
+
+ public String getDeviceOidId() {
+ return deviceOidId == null ? "" : deviceOidId;
+ }
+
+ public void setDeviceOidId(String deviceOidId) {
+ this.deviceOidId = deviceOidId;
+ }
+
+ public List<FwVersionBean> getFwVersion() {
+ return fwVersion;
+ }
+
+ public void setFwVersion(List<FwVersionBean> fwVersion) {
+ this.fwVersion = fwVersion;
+ }
+
public boolean isActivate() {
return activate;
}
@@ -57,8 +128,8 @@
private boolean activate;//鏄惁婵�娲昏澶�(true锛氭縺娲伙紱false锛氭湭婵�娲�)
- private boolean popUpgrade;//鏀硅澶囨槸鍚︽湁寮圭獥鍗囩骇
- private boolean subPopUpgrade;//涓嬫寕璁惧鏄惁鏈夊脊绐楀崌绾�
+ private boolean popUpgrade;//鏀硅澶囨槸鍚︽湁寮圭獥鍗囩骇
+ private boolean subPopUpgrade;//涓嬫寕璁惧鏄惁鏈夊脊绐楀崌绾�
public boolean isSubPopUpgrade() {
return subPopUpgrade;
@@ -77,7 +148,7 @@
}
public String getWorkStatusDesc() {
- return workStatusDesc==null?"":this.workStatusDesc;
+ return workStatusDesc == null ? "" : this.workStatusDesc;
}
public void setWorkStatusDesc(String workStatusDesc) {
@@ -181,20 +252,38 @@
this.oid = oid;
}
+ /**
+ * 鑾峰彇璁惧鍨嬪彿宸插吋鐢˙MS璁惧鎯呭喌(bms璁惧浣跨敤鏄疍eviceModel瀛楁锛屽叾瀹冭澶嘜model瀛楁) 骞冲彴璇村悗闈細缁熶竴瀛楁
+ *
+ * @return 璁惧鍨嬪彿
+ */
public String getOmodel() {
- return omodel == null ? "" : omodel;
+ return TextUtils.isEmpty(omodel) ? getDeviceModel() : omodel;
}
public void setOmodel(String omodel) {
this.omodel = omodel;
}
+ /**
+ * 鑾峰彇璁惧sn(mac)宸插吋鐢˙MS璁惧鎯呭喌(bms璁惧浣跨敤鏄痬ac瀛楁锛屽叾瀹冭澶噊sn瀛楁) 骞冲彴璇村悗闈細缁熶竴瀛楁
+ *
+ * @return 璁惧mac
+ */
public String getOsn() {
- return osn == null ? "" : osn;
+ return TextUtils.isEmpty(osn) ? getMac() : osn;
}
public void setOsn(String osn) {
this.osn = osn;
+ }
+
+ public String getMac() {
+ return mac == null ? "" : mac;
+ }
+
+ public void setMac(String mac) {
+ this.mac = mac;
}
public String getPowerPvNow() {
@@ -309,6 +398,7 @@
this.localSecret = localSecret;
}
+
/**
* 鎷间綇瀹呭湴鍧�
*
--
Gitblit v1.8.0