~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -1,5 +1,9 @@
			package com.hdl.photovoltaic.ui.bean;

			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;
			@@ -10,8 +14,6 @@
			* 云端逆变器实体类
			*/
			public class CloudInverterDeviceBean implements Serializable {


			/**
			* true-在线
			* false-离线
			@@ -25,18 +27,134 @@
			private String sid;
			private String oid;
			private String omodel;//设备型号
			private String deviceModel;//设备型号（bms设备）
			private String deviceOidId;//设备云端上oid（bms设备）

			private String osn;//设备sn(mac)

			private String mac;//（bms设备mac）,后面统一改成mac
			private String powerPvNow;//发电功率
			private String totalElectricityPvToday;//今日发电量
			private String systemStatusDesc;//状态

			private String inv;//inv状态
			private int deviceStatus;//1:待机,2:连接中,3:故障,4:运行,5:离线
			private String addresses;
			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 ：电池单元，LOAD_CENTRE ：负载控制中心)

			private String homeId;
			private String homeName;
			private String outputActivePower;//逆变器输出有功功率
			private String address;//详细地址
			private HouseInfoBean.Location location;//电站地址
			private String localSecret;//所属电站的本地密钥

			private List<FwVersionBean> fwVersion = new ArrayList<>();//BMS设备才有的固件版本
			private String chargeToday;//今日充电量，BMS设备才有的
			private String dischargeToday;//今日放电量，BMS设备才有的

			/**
			* 今日充电量，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;
			}

			public void setActivate(boolean activate) {
			this.activate = activate;
			}

			private boolean activate;//是否激活设备(true：激活；false：未激活)

			private boolean popUpgrade;//改设备是否有弹窗升级
			private boolean subPopUpgrade;//下挂设备是否有弹窗升级

			public boolean isSubPopUpgrade() {
			return subPopUpgrade;
			}

			public void setSubPopUpgrade(boolean subPopUpgrade) {
			this.subPopUpgrade = subPopUpgrade;
			}

			public boolean isPopUpgrade() {
			return popUpgrade;
			}

			public void setPopUpgrade(boolean popUpgrade) {
			this.popUpgrade = popUpgrade;
			}

			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 +224,8 @@
			}

			public String getSid() {
			return sid == null ? "" : sid;

			return TextUtils.isEmpty(sid) ? "" : sid;
			}

			public void setSid(String sid) {
			@@ -121,20 +240,38 @@
			this.oid = oid;
			}

			/**
			* 获取设备型号已兼用BMS设备情况(bms设备使用是DeviceModel字段，其它设备Omodel字段) 平台说后面会统一字段
			*
			* @return 设备型号
			*/
			public String getOmodel() {
			return omodel == null ? "" : omodel;
			return TextUtils.isEmpty(omodel) ? getDeviceModel() : omodel;
			}

			public void setOmodel(String omodel) {
			this.omodel = omodel;
			}

			/**
			* 获取设备sn(mac)已兼用BMS设备情况(bms设备使用是mac字段，其它设备osn字段) 平台说后面会统一字段
			*
			* @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() {
			@@ -193,5 +330,76 @@
			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();
			}
			}