2025年06月24日16:53:04

wjc

22 小时以前 0cb577d80ca6cd5d086745ae8d651b0ecff99e67

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

@@ -159,7 +159,6 @@
            }



//            //模拟设备列表数据
//            List<GatewayBean> mockData = getGatewayDeviceListMockData(3);
//            if (mockData.size() > 0) {
@@ -1156,6 +1155,33 @@

    }


    /**
     * 删除oid（逆变器，bms，电池包）
     *
     * @param mac          网关mac
     * @param linkCallBack 回调
     */
    public void deleteOid(String mac, JsonArray oidList, LinkCallBack<Boolean> linkCallBack) {
        String requestUrl = TopicApi.DELETE_DEVICE;
        TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, oidList, "", new HDLLinkCallBack() {
            @Override
            public void onSuccess(String json) {
                if (linkCallBack != null) {
                    linkCallBack.onSuccess(true);
                }
            }

            @Override
            public void onError(HDLLinkException e) {
                if (linkCallBack != null) {
                    linkCallBack.onError(e);
                }
            }
        });

    }

    /**
     * 获取逆变器列表,整合云端逆变器列表和本地逆变器列表(设备类型有:并网逆变器，离线逆变器，负载中心设备);
     * 注意:有外网，以云端设备列表为准;云端没有，本地存在，则删除本地；否则，没有外网只有局域网，以本地为主,搜索多少个设备就显示多少个
@@ -1204,7 +1230,7 @@
                                if (loadCentreDeviceList == null) {
                                    if (cloudCallBeak != null) {
                                        //没有数据，默认返回本地逆变器列表;
                                        cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null,false));
                                        cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
                                    }
                                    return;
                                }
@@ -1216,7 +1242,7 @@
                            public void onFailure(HDLException e) {
                                //向云端获取负载中心设备列表失败后，默认返回本地逆变器列表;
                                if (cloudCallBeak != null) {
                                    cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null,false));
                                    cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
                                }
                            }
                        });
@@ -1295,7 +1321,7 @@
        if (list == null || list.size() == 0) {
            //云端没有绑定逆变器,默认返回本地逆变器列表;
            if (cloudCallBeak != null) {
                cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list,false));
                cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
            }
            return;
        }
@@ -1312,7 +1338,7 @@
                    //到最后一条，才处理回调
                    if (atomicInteger.get() == list.size()) {
                        if (cloudCallBeak != null) {
                            cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list,false));
                            cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
                        }
                    }
                }
@@ -1326,7 +1352,7 @@
                    //到最后一条，才处理回调
                    if (atomicInteger.get() == list.size()) {
                        if (cloudCallBeak != null) {
                            cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list,false));
                            cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
                        }
                    }
                    HdlLogLogic.print("获取设备远程通讯信息失败(mac:" + cloudInverterDeviceBean.getOsn() + ")------" + e.getMsg() + "(" + e.getCode() + ")", true);