Merge branch '1.2.0' into 1.5.1_google

wjc

2025-04-30 f91ef956cf482ed4ce0885dc47794b783c20c415

 app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java

@@ -33,7 +33,7 @@
    private String systemStatusDesc;//状态

    private String inv;//inv状态
    private int deviceStatus;//1:待机,2:连接中,3:故障,4:运行,5:离线
    private int deviceStatus;// ： 连接中，2 ： 故障，3 ： 运行，4 ： 离线
    private String addresses;//子网号/设备号
    private List<DeviceAttributeBean> status;

@@ -48,6 +48,27 @@
    private String address;//详细地址
    private HouseInfoBean.Location location;//电站地址
    private String localSecret;//所属电站的本地密钥

    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() {
@@ -117,7 +138,8 @@
    }

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

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

    public void setSid(String sid) {
@@ -267,12 +289,12 @@
     */
    public String getHomeAddress() {
        if (this.location == null) {
            return this.address;
            return this.getAddress();
        }
        return this.location.getNationName() + this.location.getProvinceName() + this.location.getCityName() + this.address;
        return this.location.getNationName() + " " + this.location.getProvinceName() + " " + this.location.getCityName() + " " + this.getAddress();
    }

    public String getHomeNameAndDeviceName() {
        return homeName + "_" + this.getName();
        return this.getHomeName() + "_" + this.getName();
    }
}