2025年02月24日17:22:38

wjc

2025-02-24 d32a308c6f6286669ac5941d1616bfdc9829361e

2025年02月24日17:22:38

 app/src/main/java/com/hdl/photovoltaic/enums/DebugStatus.java

New file
@@ -0,0 +1,27 @@
package com.hdl.photovoltaic.enums;

/**
 * 电站的调试状态
 */
public @interface DebugStatus {
    /**
     * 全部
     */
    String All = "";//全部
    /**
     * 调试中
     */
    String Debugging = "Debugging";//调试中
    /**
     * 调试完成
     */
    String WAIT_DELIVERED = "WAIT_DELIVERED";//调试完成
    /**
     * 已交付
     */
    String Delivered = "Delivered";//已交付
    /**
     * 授权调试
     */
    String SECONDARY_DEBUGGIN = "SECONDARY_DEBUGGIN";//授权调试
}

 app/src/main/java/com/hdl/photovoltaic/enums/SortType.java

@@ -22,6 +22,11 @@
     * 当月发电量
     */
    String monthElectricitySort = "monthElectricitySort";//当月发电量

    /**
     * 电池容量排序
     */
    String batteryCapacitySort = "batteryCapacitySort";//电池容量排序
    /**
     * 创建时间排序
     */

 app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java

@@ -1732,7 +1732,13 @@
        gatewayBean.setDevice_name(cloudInverterDeviceBean.getName());//设备名称
        gatewayBean.setGatewayType(cloudInverterDeviceBean.getSpk());//设置spk
        gatewayBean.setLocalEncrypt(true);
        gatewayBean.setMaster(GatewayMasterType.MasterTrue);//默认都是主逆变器(以后支持从逆变器要更改)
        if (cloudInverterDeviceBean.getSpk().equals(HdlDeviceLogic.sHdlDeviceLogic.OFF_INVERTER_OG_SPK)) {
            //离网逆变器
            gatewayBean.setMaster(String.valueOf(cloudInverterDeviceBean.isMaster()));//默认都是主逆变器(以后支持从逆变器要更改)
        } else {
            //逆变器
            gatewayBean.setMaster(GatewayMasterType.MasterTrue);//默认都是主逆变器(以后支持从逆变器要更改)
        }
        gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//设备状态
        gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//软件版本号
        gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//设备类型(产品二级分类名称

 app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java

@@ -33,79 +33,23 @@
        return sHdlESLocalJsonLogic;
    }

    /**
     * 脚本地址域名
     */
    private static final String address = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu";


    /**
     * 【逆变器】设备型号
     * 拼接新地址
     *
     * @param fileName    json文件名称
     * @param deviceType  设备类型（inv，lc，bms，battery）
     * @param deviceModel 设备型号
     * @return 新地址
     */
    public static final String deviceModel_ME_GSE_S5K = "ME-GSE-S5K";
    /**
     * 【负载控制中心】设备型号
     */
    public static final String deviceModel_ME_GSE_SPG63A = "ME-GSE-SPG63A";
    /**
     * 【BMS】设备型号
     */
    public static final String deviceModel_ME_GSE_BMS15K = "ME-GSE-BMS15K";
    /**
     * 【电池包】设备型号
     */
    public static final String deviceModel_ME_GSE_B5K = "ME-GSE-B5K";

    /**
     * 创建电站-逆变器参数配置
     */
    public static final String hdl_inv_ecu_quick = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/currentLanguage/inv/deviceModel/modbus_hdl_inv_ecu_quick_v1.5.1.json";
    /**
     * 创建电站-负载控制中心参数配置
     */
    public static final String hdl_lc_ecu_quick = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/currentLanguage/lc/deviceModel/modbus_hdl_lc_ecu_quick_v1.5.0.json";
    /**
     * 逆变器参数配置（config）
     */
    public static final String hdl_inv_ecu = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/currentLanguage/inv/deviceModel/modbus_hdl_inv_ecu_v1.5.1.json";
    /**
     * 逆变器详情-pv
     */
    public static final String hdl_inv_ecu_info_pv = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/currentLanguage/inv/deviceModel/info/modbus_hdl_inv_ecu_info_pv_v1.4.2.json";
    /**
     * 逆变器详情-输出
     */
    public static final String hdl_inv_ecu_info_output = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/currentLanguage/inv/deviceModel/info/modbus_hdl_inv_ecu_info_output_v1.4.2.json";
    /**
     * 逆变器详情-item项
     */
    public static final String hdl_inv_ecu_info_item = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/currentLanguage/inv/deviceModel/info/modbus_hdl_inv_ecu_info_item_v1.5.1.json";
    /**
     * 获取负载控制中心
     */
    public static final String hdl_lc_ecu_info_item = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/currentLanguage/lc/deviceModel/modbus_hdl_lc_ecu_info_item_v1.5.0.json";
    /**
     * 获取BMS信息
     */
    public static final String hdl_bms_ecu = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/currentLanguage/bms/deviceModel/modbus_hdl_bms_ecu_v1.4.2.json";
    /**
     * 电池包信息
     */
    public static final String hdl_battery_ecu = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/currentLanguage/battery/deviceModel/modbus_hdl_battery_ecu_v1.4.2.json";

    /**
     * 电池包-电芯信息
     */
    public static final String hdl_battery_ecu_cell = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/currentLanguage/battery/deviceModel/modbus_hdl_battery_ecu_cell_v1.4.2.json";

    /**
     * 逆变器详情-信号点
     */
    public static final String hdl_inv_ecu_info_signal = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/currentLanguage/inv/deviceModel/info/modbus_hdl_inv_ecu_info_signal_v1.4.1.json";

    /**
     * 获取逆变器所有json中文
     */
    public static final String hdl_inv_ecu_all_zh = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/zh/all_v1.5.1.json";
    /**
     * 获取逆变器所有json英文
     */
    public static final String hdl_inv_ecu_all_en = "https://hdl-hz-dev.oss-cn-hangzhou.aliyuncs.com/ecu/en/all_v1.5.1.json";
    private String getStrJointNewUrl(String fileName, String deviceType, String deviceModel) {
        return address + "/" + UserConfigManage.getInstance().getCurrentAppLanguage() + "/" + deviceType + "/" + deviceModel + "/" + fileName;
    }

    /**
     * 初始化脚本url
@@ -115,17 +59,31 @@
    private Map<String, String> getUrlMap() {
        //注意（逆变器:ME-GSE-S5K，负载中心:ME-GSE-SPG63A，bms:ME-GSE-BMS15K，电池包:ME-GSE-B5K）设备型号不一样
        Map<String, String> map = new HashMap<>();
        map.put(this.getNewUrl(hdl_lc_ecu_info_item, deviceModel_ME_GSE_SPG63A), deviceModel_ME_GSE_SPG63A);//获取负载控制中心
        map.put(this.getNewUrl(hdl_lc_ecu_quick, deviceModel_ME_GSE_SPG63A), deviceModel_ME_GSE_SPG63A); //创建电站-负载控制中心参数配置
        map.put(this.getNewUrl(hdl_inv_ecu_quick, deviceModel_ME_GSE_S5K), deviceModel_ME_GSE_S5K);//创建电站-逆变器参数配置
        map.put(this.getNewUrl(hdl_inv_ecu, deviceModel_ME_GSE_S5K), deviceModel_ME_GSE_S5K);//逆变器参数配置
        map.put(this.getNewUrl(hdl_inv_ecu_info_pv, deviceModel_ME_GSE_S5K), deviceModel_ME_GSE_S5K);// 逆变器详情-pv
        map.put(this.getNewUrl(hdl_inv_ecu_info_output, deviceModel_ME_GSE_S5K), deviceModel_ME_GSE_S5K);//逆变器详情-输出
        map.put(this.getNewUrl(hdl_inv_ecu_info_item, deviceModel_ME_GSE_S5K), deviceModel_ME_GSE_S5K);//逆变器详情-item项
        map.put(this.getNewUrl(hdl_inv_ecu_info_signal, deviceModel_ME_GSE_S5K), deviceModel_ME_GSE_S5K);//逆变器详情-信号点
        map.put(this.getNewUrl(hdl_bms_ecu, deviceModel_ME_GSE_BMS15K), deviceModel_ME_GSE_BMS15K);//获取BMS信息
        map.put(this.getNewUrl(hdl_battery_ecu, deviceModel_ME_GSE_B5K), deviceModel_ME_GSE_B5K);//电池包信息
        map.put(this.getNewUrl(hdl_battery_ecu_cell, deviceModel_ME_GSE_B5K), deviceModel_ME_GSE_B5K);//电池包-电芯信息
        map.put(this.getStrJointNewUrl(FileName.hdl_lc_ecu_info_item, DeviceType.LC, DeviceModel.LC), DeviceModel.LC);//获取负载控制中心
        map.put(this.getStrJointNewUrl(FileName.hdl_lc_ecu_quick, DeviceType.LC, DeviceModel.LC), DeviceModel.LC); //创建电站-负载控制中心参数配置
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_ecu_quick, DeviceType.INV, DeviceModel.INV), DeviceModel.INV);//创建电站-逆变器参数配置
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_ecu, DeviceType.INV, DeviceModel.INV), DeviceModel.INV);//逆变器参数配置
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_ecu_info_pv, DeviceType.INV, DeviceModel.INV), DeviceModel.INV);// 逆变器详情-pv
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_ecu_info_output, DeviceType.INV, DeviceModel.INV), DeviceModel.INV);//逆变器详情-输出
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_ecu_info_item, DeviceType.INV, DeviceModel.INV), DeviceModel.INV);//逆变器详情-item项
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_ecu_info_signal, DeviceType.INV, DeviceModel.INV), DeviceModel.INV);//逆变器详情-信号点
        map.put(this.getStrJointNewUrl(FileName.hdl_bms_ecu, DeviceType.BMS, DeviceModel.INV_BMS), DeviceModel.INV_BMS);//获取BMS信息
        map.put(this.getStrJointNewUrl(FileName.hdl_battery_ecu, DeviceType.BATTERY, DeviceModel.INV_BATTERY), DeviceModel.INV_BATTERY);//电池包信息
        map.put(this.getStrJointNewUrl(FileName.hdl_battery_ecu_cell, DeviceType.BATTERY, DeviceModel.INV_BATTERY), DeviceModel.INV_BATTERY);//电池包-电芯信息
        //离网逆变器
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_ecu_quick_off, DeviceType.INV, DeviceModel.OFF_INV), DeviceModel.OFF_INV);//离网逆变器快速配置
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_master_ecu_off, DeviceType.INV, DeviceModel.OFF_INV), DeviceModel.OFF_INV);//离网逆变器主机配置
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_slave_ecu_off, DeviceType.INV, DeviceModel.OFF_INV), DeviceModel.OFF_INV);//离网逆变器从机配置
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_ecu_info_pv_off, DeviceType.INV, DeviceModel.OFF_INV), DeviceModel.OFF_INV);//离网逆变器详情光伏输入
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_ecu_info_input_off, DeviceType.INV, DeviceModel.OFF_INV), DeviceModel.OFF_INV);//离网逆变器详情交流输入
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_ecu_info_output_off, DeviceType.INV, DeviceModel.OFF_INV), DeviceModel.OFF_INV);//离网逆变器详情交流输出
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_ecu_info_item_off, DeviceType.INV, DeviceModel.OFF_INV), DeviceModel.OFF_INV);//离网逆变器详情基础参数
        map.put(this.getStrJointNewUrl(FileName.hdl_inv_ecu_info_signal_off, DeviceType.INV, DeviceModel.OFF_INV), DeviceModel.OFF_INV);//离网逆变器详情统计
        map.put(this.getStrJointNewUrl(FileName.hdl_bms_ecu_off, DeviceType.BMS, DeviceModel.OFF_INV_BMS), DeviceModel.OFF_INV_BMS);//离网逆变器BMS详情
        map.put(this.getStrJointNewUrl(FileName.hdl_battery_ecu_off, DeviceType.BATTERY, DeviceModel.OFF_INV_BATTERY), DeviceModel.OFF_INV_BATTERY);//离网逆变器电池详情
        map.put(this.getStrJointNewUrl(FileName.hdl_battery_ecu_cell_off, DeviceType.BATTERY, DeviceModel.OFF_INV_BATTERY), DeviceModel.OFF_INV_BATTERY);//离网逆变器电池电芯


        return map;
    }

@@ -175,18 +133,6 @@
    public String readHdlESLocalJson(String url, String deviceModel) {
        return this.readJson(url, deviceModel);
    }

    /**
     * 处理url返回新的url
     *
     * @param url         地址
     * @param deviceModel 设备类型
     * @return 返回地址
     */
    private String getNewUrl(String url, String deviceModel) {
        return url.replace("currentLanguage", UserConfigManage.getInstance().getCurrentAppLanguage()).replace("deviceModel", deviceModel);
    }


    /**
     * 保存json数据
@@ -248,4 +194,183 @@
        }
    }

    /**
     * Json数据配置文件名
     */
    public @interface FileName {
        /**
         * 创建电站-逆变器参数配置
         */
        String hdl_inv_ecu_quick = "modbus_hdl_inv_ecu_quick_v1.5.1.json";
        /**
         * 创建电站-负载控制中心参数配置
         */
        String hdl_lc_ecu_quick = "modbus_hdl_lc_ecu_quick_v1.5.0.json";
        /**
         * 逆变器参数配置（config）
         */
        String hdl_inv_ecu = "modbus_hdl_inv_ecu_v1.5.2.json";
        /**
         * 逆变器详情-pv
         */
        String hdl_inv_ecu_info_pv = "info/modbus_hdl_inv_ecu_info_pv_v1.4.2.json";
        /**
         * 逆变器详情-输出
         */
        String hdl_inv_ecu_info_output = "info/modbus_hdl_inv_ecu_info_output_v1.4.2.json";
        /**
         * 逆变器详情-item项
         */
        String hdl_inv_ecu_info_item = "info/modbus_hdl_inv_ecu_info_item_v1.5.2.json";
        /**
         * 获取负载控制中心
         */
        String hdl_lc_ecu_info_item = "modbus_hdl_lc_ecu_info_item_v1.5.0.json";
        /**
         * 获取BMS信息
         */
        String hdl_bms_ecu = "modbus_hdl_bms_ecu_v1.4.2.json";
        /**
         * 电池包信息
         */
        String hdl_battery_ecu = "modbus_hdl_battery_ecu_v1.4.2.json";

        /**
         * 电池包-电芯信息
         */
        String hdl_battery_ecu_cell = "modbus_hdl_battery_ecu_cell_v1.4.2.json";

        /**
         * 逆变器详情-信号点
         */
        String hdl_inv_ecu_info_signal = "info/modbus_hdl_inv_ecu_info_signal_v1.4.1.json";


        /**
         * 离网逆变器快速配置
         */
        String hdl_inv_ecu_quick_off = "modbus_hdl_inv_ecu_quick_v1.5.2.json";

        /**
         * 离网逆变器主机配置
         */
        String hdl_inv_master_ecu_off = "modbus_hdl_inv_master_ecu_v1.5.2.json";

        /**
         * 离网逆变器从机配置
         */
        String hdl_inv_slave_ecu_off = "modbus_hdl_inv_slave_ecu_v1.5.2.json";

        /**
         * 离网逆变器详情光伏输入
         */
        String hdl_inv_ecu_info_pv_off = "modbus_hdl_inv_ecu_info_pv_v1.5.2.json";

        /**
         * 离网逆变器详情交流输入
         */
        String hdl_inv_ecu_info_input_off = "modbus_hdl_inv_ecu_info_input_v1.5.2.json";

        /**
         * 离网逆变器详情交流输出
         */
        String hdl_inv_ecu_info_output_off = "modbus_hdl_inv_ecu_info_output_v1.5.2.json";

        /**
         * 离网逆变器详情基础参数
         */
        String hdl_inv_ecu_info_item_off = "modbus_hdl_inv_ecu_info_item_v1.5.2.json";

        /**
         * 离网逆变器详情统计
         */
        String hdl_inv_ecu_info_signal_off = "modbus_hdl_inv_ecu_info_signal_v1.5.2.json";

        /**
         * 离网逆变器BMS详情
         */
        String hdl_bms_ecu_off = "modbus_hdl_bms_ecu_v1.5.2.json";

        /**
         * 离网逆变器电池详情
         */
        String hdl_battery_ecu_off = "modbus_hdl_battery_ecu_v1.5.2.json";

        /**
         * 离网逆变器电池电芯
         */
        String hdl_battery_ecu_cell_off = "modbus_hdl_battery_ecu_cell_v1.5.2.json";


        /**
         * 获取逆变器所有json中文
         */
        String hdl_inv_ecu_all_zh = "/zh/all_v1.5.1.json";
        /**
         * 获取逆变器所有json英文
         */
        String hdl_inv_ecu_all_en = "/en/all_v1.5.1.json";

    }

    /**
     * 设备型号
     */
    public @interface DeviceModel {
        /**
         * 【逆变器】设备型号
         */
        String INV = "ME-GSE-S5K";
        /**
         * 【负载控制中心】设备型号
         */
        String LC = "ME-GSE-SPG63A";
        /**
         * 【BMS】设备型号
         */
        String INV_BMS = "ME-GSE-BMS15K";
        /**
         * 【电池包】设备型号
         */
        String INV_BATTERY = "ME-GSE-B5K";


        /**
         * 【离线逆变器】设备型号
         */
        String OFF_INV = "ME-GLE-S5K";

        /**
         * 【离网逆变器虚拟BMS】设备型号
         */
        String OFF_INV_BMS = "ME-GLE-S5K-BMS";
        /**
         * 【离网逆变器电池包】设备型号
         */
        String OFF_INV_BATTERY = "ME-GLE-B5K";
    }

    /**
     * 设备类型
     */
    public @interface DeviceType {
        /**
         * 【逆变器】类型
         */
        String INV = "inv";
        /**
         * 【负载控制中心】类型
         */
        String LC = "lc";
        /**
         * 【BMS】类型
         */
        String BMS = "bms";
        /**
         * 【电池包】类型
         */
        String BATTERY = "battery";

    }

}

 app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java

@@ -103,6 +103,8 @@

    /**
     * 获取中文【json资源文件夹】全路径
     *
     * @param deviceModel 设备型号
     */
    public String getHdlESLocalJsonZhRootPath(String deviceModel) {
        return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + LocalManageUtil.zh + "/" + deviceModel;
@@ -110,6 +112,8 @@

    /**
     * 获取英文【json资源文件夹】全路径
     *
     * @param deviceModel 设备型号
     */
    public String getHdlESLocalJsonEnRootPath(String deviceModel) {
        return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + LocalManageUtil.en + "/" + deviceModel;
@@ -198,15 +202,26 @@
     */
    public void createHdlESLocalJsonDirectory() {
        //中文文件夹
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.deviceModel_ME_GSE_S5K));//逆变器
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.deviceModel_ME_GSE_SPG63A));//负载中心
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.deviceModel_ME_GSE_BMS15K));//BMS
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.deviceModel_ME_GSE_B5K));//电池包

        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV));//逆变器
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.LC));//负载中心
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_BMS));//BMS
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_BATTERY));//电池包
        //离线逆变器
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV));//离线逆变器
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS));//离网逆变器虚拟BMS
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BATTERY));//离网逆变器电池包


        //英文文件夹
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.deviceModel_ME_GSE_S5K));
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.deviceModel_ME_GSE_SPG63A));
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.deviceModel_ME_GSE_BMS15K));
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.deviceModel_ME_GSE_B5K));
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV));
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.LC));
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_BMS));
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_BATTERY));
        //离线逆变器
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV));//离线逆变器
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS));//离网逆变器虚拟BMS
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BATTERY));//离网逆变器电池包

    }


 app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java

@@ -343,7 +343,7 @@
     *                             ascending:升序),
     * @param installedCapacityMin 最小组串容量(装机容量)
     * @param installedCapacityMax 最大组串容量(装机容量)
     * @param gridType             并网状态 (全部 ："";FULL_GRID ： 并网;OFFLINE ：离网)
     * @param debugStatus             调试状态(全部;调试中;调试完成;已交付;授权调试)
     * @param powerStationStatus   电站状态 (全部  ："";1 ： 正常;2 ： 离线; 3 ： 待接入;4 ： 故障)
     * @param pageNo               页码
     * @param pageSize             页数（一页多少数据）
@@ -353,7 +353,7 @@
            String keyValue,
            String installedCapacityMin,
            String installedCapacityMax,
            String gridType,
            String debugStatus,
            String powerStationStatus,
            long pageNo, long pageSize, CloudCallBeak<HouseBeanClass> cloudCallBeak) {

@@ -376,9 +376,9 @@
            } catch (Exception ignored) {
            }
        }
        if (!TextUtils.isEmpty(gridType)) {
        if (!TextUtils.isEmpty(debugStatus)) {
            try {
                json.addProperty("gridType", gridType);
                json.addProperty("debugStatus", debugStatus);
            } catch (Exception ignored) {
            }
        }

 app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java

@@ -69,9 +69,9 @@
        //当日发电量
        holder.day_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity()));
        holder.day_kwh_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getTodayElectricity(), UnitType.kWh));
        //当月发电量
        holder.month_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getMonthElectricity()));
        holder.month_kwh_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getMonthElectricity(), UnitType.kWh));
        //电池容量
        holder.month_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity()));
        holder.month_kwh_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getBatteryCapacity(), UnitType.kWh));

        holder.plant_details_location_tv.setText(houseIdBean.getHomeAddress());
        holder.item_parent_rl.setTag(position);

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

@@ -48,6 +48,15 @@
    private String address;//详细地址
    private HouseInfoBean.Location location;//电站地址
    private String localSecret;//所属电站的本地密钥
    private boolean  master;//离网逆变器才返回
    public boolean isMaster() {
        return master;
    }

    public void setMaster(boolean master) {
        this.master = master;
    }



    public String getSystemStatusDesc() {

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

@@ -19,6 +19,9 @@
    private String monthElectricity;//当月发电量


    private String batteryCapacity;//电池容量


    private int powerStationStatus;//电站状态(电站状态    1:正常(运行),2:离线,3:连接中,4:故障)
    private String localSecret;//本地通讯秘钥

@@ -38,6 +41,14 @@

    private String address;//详细地址

    public String getBatteryCapacity() {
        return batteryCapacity == null ? "" : batteryCapacity;
    }

    public void setBatteryCapacity(String batteryCapacity) {
        this.batteryCapacity = batteryCapacity;
    }

    public String getDeliverStatus() {
        return deliverStatus == null ? "" : deliverStatus;
    }

 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java

@@ -31,6 +31,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.enums.DebugStatus;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.enums.PowerStationStatus;
@@ -102,7 +103,7 @@
    private String value = SortValue.all;//descending:降序,ascending:升序
    private String installedCapacityMinValue = "";//最小组串容量(装机容量)
    private String installedCapacityMaxValue = "";//最大组串容量(装机容量)
    private String gridTypeValue = "";//并网状态(全部 不传该过滤参数,FULL_GRID:并网,OFFLINE:离网)
    private String debugStatus = DebugStatus.All;//筛选条件状态
    private String powerStationStatusValue = PowerStationStatus.All;//电站状态(全部 不传该过滤参数,1:正常(运行),2:离线,3:待接入,4:故障)

    private final long pageSize = 20;//页数
@@ -115,7 +116,7 @@
        value = SortValue.all;
        installedCapacityMinValue = "";
        installedCapacityMaxValue = "";
        gridTypeValue = "";
        debugStatus = DebugStatus.All;
        powerStationStatusValue = PowerStationStatus.All;
    }

@@ -148,7 +149,7 @@
                selectedTitleLabelStyle();
                initializationState();
                getStatusOverview();
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);

            }
        });
@@ -173,7 +174,7 @@
                viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
                viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
                viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
            }
        });
        //故障
@@ -185,7 +186,7 @@
                viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
                viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
                viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
            }
        });
        //离线
@@ -197,7 +198,7 @@
                viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
                viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
                viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
            }
        });
        //待接入
@@ -209,7 +210,7 @@
                viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
                viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
                viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
            }
        });

@@ -243,14 +244,14 @@
            public void onClick(View v) {
                DefaultFilteringDialog defaultFilteringDialog = new DefaultFilteringDialog(_mActivity);
                defaultFilteringDialog.show();
                defaultFilteringDialog.initState(installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue);
                defaultFilteringDialog.initState(installedCapacityMinValue, installedCapacityMaxValue, debugStatus);
                defaultFilteringDialog.setOnClickListener(new DefaultFilteringDialog.OnClickListener() {
                    @Override
                    public void confirm(String min, String max, String state) {
                        installedCapacityMinValue = min;//最小组串容量(装机容量)
                        installedCapacityMaxValue = max;//最大组串容量(装机容量)
                        gridTypeValue = state;//并网状态(全部 不传该过滤参数,FULL_GRID:并网,OFFLINE:离网)
                        loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                        debugStatus = state;//调试状态(全部;调试中;调试完成;已交付;授权调试)
                        loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
                    }
                });
            }
@@ -263,7 +264,7 @@
            @Override
            public void onRefresh() {
                viewBinding.fragmentHouseSrl.setRefreshing(false);
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
                getStatusOverview();
            }
        });
@@ -284,7 +285,7 @@
                    if (!isHouseLoadingMore) {
                        // 滑动到了底部，执行相应的操作
                        HdlLogLogic.print("---滑动到了底部");
                        loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, ++currentHouseListPage, false);
                        loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, ++currentHouseListPage, false);
                    }
                }
            }
@@ -401,7 +402,7 @@
                screenIconState(viewBinding.stationNameRl, viewBinding.stationNameIv, isSelected);
                key = SortType.homeNameSort;
                value = isSelected ? SortValue.ascending : SortValue.descending;
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
            }
        });
        //电站发电功率筛选
@@ -412,7 +413,7 @@
                screenIconState(viewBinding.stationPowerRl, viewBinding.stationPowerIv, isSelected);
                key = SortType.powerSort;
                value = isSelected ? SortValue.ascending : SortValue.descending;
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
            }
        });
        //电站当日发电量筛选
@@ -423,18 +424,18 @@
                screenIconState(viewBinding.stationDayRl, viewBinding.stationDayIv, isSelected);
                key = SortType.todayElectricitySort;
                value = isSelected ? SortValue.ascending : SortValue.descending;
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
            }
        });
        //电站当月发电量筛选
        //电站电池容量筛选
        viewBinding.stationMonthRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                boolean isSelected = !v.isSelected();
                screenIconState(viewBinding.stationMonthRl, viewBinding.stationMonthIv, isSelected);
                key = SortType.monthElectricitySort;
                key = SortType.batteryCapacitySort;
                value = isSelected ? SortValue.ascending : SortValue.descending;
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
            }
        });
        //设备点击
@@ -620,7 +621,7 @@
                // 取消粘性事件
                EventBus.getDefault().removeStickyEvent(eventBus);
                //uin创建电站成功后通知
                loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
                if (eventBus.getData() != null) {
                    Gson gson = new Gson();
                    String json = eventBus.getData().toString();
@@ -664,7 +665,7 @@
//                if (MqttRecvClient.getInstance() != null) {
//                    MqttRecvClient.getInstance().removeAllTopic();
//                }
                loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
            }
        } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) {
            // 取消粘性事件
@@ -706,7 +707,7 @@
                selectedTitleLabelStyle();
                initializationState();
                getStatusOverview();
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
                loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
            } else if (eventBus.getType().equals(ConstantManage.station_page)) {
                //通过首页电站进来的
                if (eventBus.getData().equals(PowerStationStatus.All)) {
@@ -771,11 +772,12 @@
     * @param key                  发电功率排序(powerSort);
     *                             今日发电量排序(todayElectricitySort);
     *                             创建时间排序(createTimeSort);
     *                             电池容量排序(batteryCapacitySort);
     * @param keyValue             (descending:降序
     *                             ascending:升序),
     * @param installedCapacityMin 最小组串容量(装机容量)
     * @param installedCapacityMax 最大组串容量(装机容量)
     * @param gridType             并网状态 (全部 ："";FULL_GRID ： 并网;OFFLINE ：离网)
     * @param gridType             调试状态(全部;调试中;调试完成;已交付;授权调试)
     * @param powerStationStatus   电站状态 (全部  ："";1 ： 正常;2 ： 离线; 3 ： 待接入;4 ： 故障)
     * @param pageNo               页码
     * @param isClear              是否清除数据

 app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java

@@ -19,6 +19,7 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogDefaultFilteringBinding;
import com.hdl.photovoltaic.enums.DebugStatus;
import com.hdl.photovoltaic.enums.GridType;
import com.hdl.photovoltaic.enums.UnitType;
import com.hdl.photovoltaic.other.HdlThreadLogic;
@@ -116,8 +117,8 @@
            public void onClick(View v) {
                setBackgroundColor(null, TitleType.string_capacity);
                setSelectedText("");
                setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
                mStateValue = GridType.All;
                setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
                mStateValue = DebugStatus.All;
            }
        });
        viewBinding.text1Tv.setOnClickListener(new View.OnClickListener() {
@@ -177,29 +178,49 @@
                setSelectedText(viewBinding.text8Tv.getTag().toString());
            }
        });

        //全部
        viewBinding.allTv.setOnClickListener(new View.OnClickListener() {

            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
                mStateValue = GridType.All;
                setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
                mStateValue = DebugStatus.All;
            }
        });
        viewBinding.gridConnectedTv.setOnClickListener(new View.OnClickListener() {
        //调试中
        viewBinding.beDebuggingTv.setOnClickListener(new View.OnClickListener() {

            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.gridConnectedTv, TitleType.GridConnectedState);
                mStateValue = GridType.FULL_GRID;
                setBackgroundColor(viewBinding.beDebuggingTv, TitleType.debuggingState);
                mStateValue = DebugStatus.Debugging;
            }
        });
        viewBinding.offNetworkTv.setOnClickListener(new View.OnClickListener() {
        //调试完成
        viewBinding.debuggingcOmpletedTv.setOnClickListener(new View.OnClickListener() {

            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.offNetworkTv, TitleType.GridConnectedState);
                mStateValue = GridType.OFFLINE;
                setBackgroundColor(viewBinding.debuggingcOmpletedTv, TitleType.debuggingState);
                mStateValue = DebugStatus.WAIT_DELIVERED;
            }
        });
        //已交付
        viewBinding.deliveredTv.setOnClickListener(new View.OnClickListener() {

            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.deliveredTv, TitleType.debuggingState);
                mStateValue = DebugStatus.Delivered;
            }
        });
        //授权调试
        viewBinding.authorizationDebuggingTv.setOnClickListener(new View.OnClickListener() {

            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.authorizationDebuggingTv, TitleType.debuggingState);
                mStateValue = DebugStatus.SECONDARY_DEBUGGIN;
            }
        });

@@ -248,8 +269,10 @@
            viewBinding.text8Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
        } else {
            viewBinding.allTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
            viewBinding.gridConnectedTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
            viewBinding.offNetworkTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
            viewBinding.beDebuggingTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
            viewBinding.debuggingcOmpletedTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
            viewBinding.deliveredTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
            viewBinding.authorizationDebuggingTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
        }
        if (textView != null) {
            textView.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_yes_129));
@@ -292,12 +315,16 @@
                        break;
                }
            }
            if (TextUtils.isEmpty(stateValue)) {
                setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
            } else if (stateValue.equals(GridType.FULL_GRID)) {
                setBackgroundColor(viewBinding.gridConnectedTv, TitleType.GridConnectedState);
            } else {
                setBackgroundColor(viewBinding.offNetworkTv, TitleType.GridConnectedState);
            if (TextUtils.isEmpty(DebugStatus.All)) {
                setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
            } else if (stateValue.equals(DebugStatus.Debugging)) {
                setBackgroundColor(viewBinding.beDebuggingTv, TitleType.debuggingState);
            } else if (stateValue.equals(DebugStatus.WAIT_DELIVERED)) {
                setBackgroundColor(viewBinding.debuggingcOmpletedTv, TitleType.debuggingState);
            } else if (stateValue.equals(DebugStatus.Delivered)) {
                setBackgroundColor(viewBinding.deliveredTv, TitleType.debuggingState);
            } else if (stateValue.equals(DebugStatus.SECONDARY_DEBUGGIN)) {
                setBackgroundColor(viewBinding.authorizationDebuggingTv, TitleType.debuggingState);
            }
        } catch (Exception ignored) {
        }
@@ -317,11 +344,13 @@
        viewBinding.text7Tv.setTag(text7);
        viewBinding.text8Tv.setTag(text8);

        viewBinding.allTv.setTag(GridType.All);
        viewBinding.gridConnectedTv.setTag(GridType.FULL_GRID);
        viewBinding.offNetworkTv.setTag(GridType.OFFLINE);
        viewBinding.allTv.setTag(DebugStatus.All);
        viewBinding.beDebuggingTv.setTag(DebugStatus.Debugging);
        viewBinding.debuggingcOmpletedTv.setTag(DebugStatus.WAIT_DELIVERED);
        viewBinding.deliveredTv.setTag(DebugStatus.Delivered);
        viewBinding.authorizationDebuggingTv.setTag(DebugStatus.SECONDARY_DEBUGGIN);
        setBackgroundColor(null, TitleType.string_capacity);
        setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
        setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
    }

    public void setOnClickListener(OnClickListener onClickListener) {
@@ -337,7 +366,7 @@

    public enum TitleType {
        string_capacity,//组串容量
        GridConnectedState//并网状态
        debuggingState//调试状态

    }


 app/src/main/res/layout/dialog_default_filtering.xml

@@ -279,34 +279,62 @@
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toStartOf="@+id/min_max_rl"
        app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
    <!--并网-->
    <!--调试中-->
    <TextView
        android:id="@+id/grid_connected_tv"
        android:id="@+id/be_debugging_tv"
        android:layout_width="102dp"
        android:layout_height="@dimen/dp_35"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="13dp"
        android:background="@drawable/config_129"
        android:gravity="center"
        android:text="@string/grid_connected"
        android:text="@string/be_debugging"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toEndOf="@+id/all_tv"
        app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
    <!--离网-->
    <!--调试完成-->
    <TextView
        android:id="@+id/off_network_tv"
        android:id="@+id/debuggingc_ompleted_tv"
        android:layout_width="102dp"
        android:layout_height="@dimen/dp_35"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="13dp"
        android:background="@drawable/config_129"
        android:gravity="center"
        android:text="@string/off_network"
        android:text="@string/debugging_completed"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toEndOf="@+id/grid_connected_tv"
        app:layout_constraintStart_toEndOf="@+id/be_debugging_tv"
        app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />

    <!--已交付-->
    <TextView
        android:id="@+id/delivered_tv"
        android:layout_width="102dp"
        android:layout_height="@dimen/dp_35"
        android:layout_marginTop="13dp"
        android:background="@drawable/config_129"
        android:gravity="center"
        android:text="@string/delivered"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toStartOf="@+id/all_tv"
        app:layout_constraintTop_toBottomOf="@+id/all_tv" />
    <!--授权调试-->
    <TextView
        android:id="@+id/authorization_debugging_tv"
        android:layout_width="102dp"
        android:layout_height="@dimen/dp_35"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="13dp"
        android:background="@drawable/config_129"
        android:gravity="center"
        android:text="@string/authorization_debugging"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toEndOf="@+id/delivered_tv"
        app:layout_constraintTop_toBottomOf="@+id/all_tv" />

    <RelativeLayout
        android:id="@+id/reset_rl"
@@ -316,7 +344,7 @@
        android:background="@color/text_FF39383D"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/off_network_tv">
        app:layout_constraintTop_toBottomOf="@+id/delivered_tv">

        <LinearLayout
            android:layout_width="wrap_content"

 app/src/main/res/layout/fragment_house_list.xml

@@ -405,7 +405,7 @@
                        android:id="@+id/station_month_tv"
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
                        android:text="@string/month_power_generation"
                        android:text="@string/battery_capacity_indicator"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_14" />


 app/src/main/res/layout/item_plant_details.xml

@@ -259,7 +259,7 @@
                        android:layout_height="@dimen/dp_15"
                        android:layout_marginTop="3dp"
                        android:gravity="center_vertical|start"
                        android:text="@string/month_power_generation"
                        android:text="@string/rated_battery_capacity"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_12" />


 app/src/main/res/values-en/strings.xml

@@ -344,4 +344,11 @@
    <string name="account_not_recoverable">Cancelling an account is an irreversible operation. After account cancellation, all account data (including nickname, avatar, QR code photo, etc.) on your app will be deleted and cannot be retrieved.</string>
    <string name="account">Account</string>
    <string name="psw">Password</string>

    <string name="battery_capacity_indicator">Battery capacity indicator</string>
    <string name="rated_battery_capacity">Rated battery capacity</string>
    <string name="be_debugging">Be debugging</string>
    <string name="debugging_completed">Debugging completed</string>
    <string name="delivered">Delivered</string>
    <string name="authorization_debugging">Authorization debugging</string>
</resources>

 app/src/main/res/values-zh/strings.xml

@@ -341,4 +341,10 @@
    <string name="account_not_recoverable">注销账户是不可恢复的操作，注销账户之后，您APP所有账户数据（包括昵称、头像、二维码照片等）都会被删除，且无法再找回。</string>
    <string name="account">账号</string>
    <string name="psw">密码</string>
    <string name="battery_capacity_indicator">电池容量</string>
    <string name="rated_battery_capacity">电池额定容量</string>
    <string name="be_debugging">调试中</string>
    <string name="debugging_completed">调试完成</string>
    <string name="delivered">已交付</string>
    <string name="authorization_debugging">授权调试</string>
</resources>

 app/src/main/res/values/strings.xml

@@ -341,5 +341,11 @@
    <string name="account_not_recoverable">注销账户是不可恢复的操作，注销账户之后，您APP所有账户数据（包括昵称、头像、二维码照片等）都会被删除，且无法再找回。</string>
    <string name="account">账号</string>
    <string name="psw">密码</string>
    <string name="battery_capacity_indicator">电池容量</string>
    <string name="rated_battery_capacity">电池额定容量</string>
    <string name="be_debugging">调试中</string>
    <string name="debugging_completed">调试完成</string>
    <string name="delivered">已交付</string>
    <string name="authorization_debugging">授权调试</string>

</resources>

 sdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java

@@ -56,7 +56,7 @@
    /**
     * 是否主网关 true false
     */
    private String master;
    private String master;//离网逆变器才返回
    /**
     * 是否加密
     */
@@ -80,7 +80,6 @@
     * 毫米波sid
     */
    private String sid;



    private String spk = "energy.hdl_inverter";
@@ -399,7 +398,6 @@
    }



    public String getSystemStatusDesc() {
        return systemStatusDesc == null ? "" : systemStatusDesc;
    }
@@ -479,7 +477,7 @@
    }

    public String getDeviceType() {
        return deviceType==null?"":deviceType;
        return deviceType == null ? "" : deviceType;
    }

    public void setDeviceType(String deviceType) {