2023年10月08日11:40:28

mac

2023-10-08 a543c926d2c994c96acd1923cecc5253d5cf45f2

2023年10月08日11:40:28

 app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java

@@ -54,7 +54,7 @@

    //region -----设备管理---------
    //添加逆变器
    public static final String POST_Device_Add = "/home-wisdom/app/device/independentRegister";
    public static final String POST_Device_Add = "/home-wisdom/program/device/independentRegister";
    //获取逆变器列表
    public static final String POST_Device_List = "/home-wisdom/app/device/inverter/list";
    //删除逆变器

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

@@ -542,6 +542,12 @@
                            removeInverter(removeSidList.get(i));
                        }

                        for (int i = 0; i < list.size(); i++) {
                            CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
                            GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(cloudInverterDeviceBean.getSid());
                            objectAssignment(cloudInverterDeviceBean, gatewayBean);
                        }

                        if (cloudCallBeak != null) {
                            cloudCallBeak.onSuccess(true);
                        }
@@ -573,19 +579,7 @@
                            CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
                            //云端对象数据交换到本地对象
                            GatewayBean gatewayBean = new GatewayBean();
                            gatewayBean.setOid(cloudInverterDeviceBean.getOid());
                            gatewayBean.setSid(cloudInverterDeviceBean.getSid());
                            gatewayBean.setGatewayId(cloudInverterDeviceBean.getGatewayId());
                            gatewayBean.setOnline(cloudInverterDeviceBean.isOnline());
                            gatewayBean.setDevice_mac(cloudInverterDeviceBean.getOsn());//设备mac
                            gatewayBean.setDevice_name(cloudInverterDeviceBean.getGatewayName());
                            gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());
                            gatewayBean.setLocalEncrypt(true);
                            gatewayBean.setMaster("true");
                            gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());
                            gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());
                            gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());
                            gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId());
                            objectAssignment(cloudInverterDeviceBean, gatewayBean);

                            //添加网关
                            HDLLinkLocalGateway.getInstance().getGatewayList().add(gatewayBean);
@@ -631,6 +625,27 @@
        HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack);
    }


    private void objectAssignment(CloudInverterDeviceBean cloudInverterDeviceBean, GatewayBean gatewayBean) {
        if (cloudInverterDeviceBean == null || gatewayBean == null) {
            return;
        }
        gatewayBean.setOid(cloudInverterDeviceBean.getOid());
        gatewayBean.setSid(cloudInverterDeviceBean.getSid());
        gatewayBean.setGatewayId(cloudInverterDeviceBean.getGatewayId());
        gatewayBean.setOnline(cloudInverterDeviceBean.isOnline());
        gatewayBean.setDevice_mac(cloudInverterDeviceBean.getOsn());//设备mac
        gatewayBean.setDevice_name(cloudInverterDeviceBean.getGatewayName());
        gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());
        gatewayBean.setLocalEncrypt(true);
        gatewayBean.setMaster("true");
        gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());
        gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());
        gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());
        gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId());

    }

    /**
     * 获取网关spk列表
     *

 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java

@@ -219,7 +219,7 @@
                HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
                    @Override
                    public void onSuccess(HDLUserRegionBean obj) {
                        AppConfigManage.setUserRegionUrl("http://59.41.255.150:7777");//obj.getRegionUrl()
                        AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
                        HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
                        HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
                            @Override