2025年04月15日08:54:09

wjc

2025-04-15 413b905fb1af7f421b801a3d7ad0b84b57e919ab

2025年04月15日08:54:09

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

@@ -40,6 +40,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;


@@ -326,6 +327,7 @@

                    @Override
                    public void onError(HDLLinkException e) {
                        HdlLogLogic.print("获取oid列表失败---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                    }
                });
                SystemClock.sleep(200);
@@ -333,10 +335,13 @@
        } else {
            //只有进入详情界面
            List<OidBean> newOidList = new ArrayList<>();
            //表示中间任何一个失败都是改变用增量上传
            AtomicBoolean isIncrementalOidAddition = new AtomicBoolean(false);
            AtomicInteger atomicInteger = new AtomicInteger(0);
            for (int i = 0; i < list.size(); i++) {
                GatewayBean gatewayBean = list.get(i);
                if (gatewayBean == null || TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
//                    isIncrementalOidAddition.set(true);
                    continue;
                }
                getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() {
@@ -344,6 +349,7 @@
                    public void onSuccess(List<OidBean> oidBeanList) {
                        atomicInteger.set(atomicInteger.get() + 1);
                        if (oidBeanList == null) {
//                            isIncrementalOidAddition.set(true);
                            return;
                        }
                        newOidList.addAll(oidBeanList);
@@ -351,19 +357,20 @@
                            if (newOidList.isEmpty()) {
                                return;
                            }
//                        //增量添加oid
//                        updateOidAdd(homeId, oidList, new CloudCallBeak<Boolean>() {
//                            @Override
//                            public void onSuccess(Boolean obj) {
//                                HdlLogLogic.print("上传oid列表到云端成功---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac(), true);
//                            }
//
//                            @Override
//                            public void onFailure(HDLException e) {
//                                HdlLogLogic.print("上传oid列表到云端失败---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
//                            }
//                        });
                            if (isIncrementalOidAddition.get()) {
                                //增量添加oid
                                updateOidAdd(homeId, newOidList, new CloudCallBeak<Boolean>() {
                                    @Override
                                    public void onSuccess(Boolean obj) {
                                        HdlLogLogic.print("上传oid列表到云端成功---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac(), true);
                                    }

                                    @Override
                                    public void onFailure(HDLException e) {
                                        HdlLogLogic.print("上传oid列表到云端失败---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                                    }
                                });
                            } else {
                            //全部获取后再上传
                            fullUpdateOid(homeId, newOidList, new CloudCallBeak<Boolean>() {
                                @Override
@@ -376,6 +383,7 @@
                                    HdlLogLogic.print("上传oid列表到云端失败(全量)---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                                }
                            });
                            }
                        }
                    }

@@ -399,6 +407,8 @@
                                    HdlLogLogic.print("上传oid列表到云端失败(增量)---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                                }
                            });
                        } else {
                            isIncrementalOidAddition.set(true);
                        }
                    }
                });
@@ -630,7 +640,7 @@
            HdlLogLogic.print("上传oid列表到云端失败---当前住宅id:" + UserConfigManage.getInstance().getHomeId() + "---上传住宅id:" + homeId, true);
            return;
        }
        if (oidList == null || oidList.size() == 0) {
        if (oidList == null || oidList.isEmpty()) {
            HdlLogLogic.print("oid列表为空，无法全量更新oid到云端---", true);
            return;
        }