From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 31 七月 2025 14:49:17 +0800 Subject: [PATCH] Merge branch '1.4.4' into dev --- app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java index 4f12d4c..07c8a40 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -1329,6 +1329,20 @@ AtomicInteger atomicInteger = new AtomicInteger(0); for (int i = 0; i < list.size(); i++) { CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i); + if (cloudInverterDeviceBean == null || !cloudInverterDeviceBean.isActivate()) { + //鏈縺娲昏澶� + atomicInteger.set(atomicInteger.get() + 1); + //娉ㄦ剰:杩欎釜閫嗗彉鍣ㄥ彧鑳芥湰鍦版帶鍒�(鍥犱负鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強GatewayID,鏃犳硶杩滅▼鎺у埗) + //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭� + refreshGatewayCacheData(false, cloudInverterDeviceBean, null, homeId); + //鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋� + if (atomicInteger.get() == list.size()) { + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false)); + } + } + HdlLogLogic.print("璁惧鏈縺娲�(mac:" + cloudInverterDeviceBean.getOsn() + "))", true); + } //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜) getDeviceRemoteInfo(homeId, cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() { @Override @@ -1831,6 +1845,7 @@ gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿 } gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk + gatewayBean.setActivate(cloudInverterDeviceBean.isActivate());//鏄惁婵�娲昏澶�(true锛氭縺娲伙紱false锛氭湭婵�娲�) } -- Gitblit v1.8.0