From 8a249407f9a91b696b88d74eea0fbf789d0ee6a4 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 24 四月 2025 10:34:05 +0800 Subject: [PATCH] 2025年04月24日10:34:03 --- app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 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 9c3491d..2a871dd 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -130,6 +130,7 @@ } newList.clear(); newList.addAll(checkNewList); + } // // 妯℃嫙璁惧鍒楄〃鏁版嵁 // List<GatewayBean> mockData = getGatewayDeviceListMockData(3); @@ -1285,13 +1286,16 @@ @Override public void onFailure(HDLException e) { atomicInteger.set(atomicInteger.get() + 1); + //娉ㄦ剰:杩欎釜閫嗗彉鍣ㄥ彧鑳芥湰鍦版帶鍒�(鍥犱负鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強GatewayID,鏃犳硶杩滅▼鎺у埗) + //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭� + refreshGatewayCacheData(false, cloudInverterDeviceBean, null, homeId); //褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鏈夊洖璋� if (atomicInteger.get() == list.size()) { if (cloudCallBeak != null) { cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId, list)); } } - HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触---msg---" + e.getMsg() + "(" + e.getCode() + ")"); + HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触(mac:"+cloudInverterDeviceBean.getOsn()+")------" + e.getMsg() + "(" + e.getCode() + ")",true); } }); } @@ -1752,7 +1756,8 @@ gatewayBean.setOgMaster(cloudInverterDeviceBean.isOgMaster()); //閫嗗彉鍣� gatewayBean.setMaster(GatewayMasterType.MasterTrue);//榛樿閮芥槸涓婚�嗗彉鍣�(浠ュ悗鏀寔浠庨�嗗彉鍣ㄨ鏇存敼) - gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵�� + gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵�侊紙閫嗗彉鍣ㄨ澶囷級 + gatewayBean.setWorkStatusDesc(cloudInverterDeviceBean.getWorkStatusDesc());//宸ヤ綔鐘舵�侊紙璐熻浇涓績璁惧锛� gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙� gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О gatewayBean.setDeviceType(cloudInverterDeviceBean.getDeviceType());//璁惧绫诲瀷(INV:閫嗗彉鍣�;BMS:BMS鎺у埗鐩�;BATTERY:鐢垫睜鍗曞厓) @@ -1767,6 +1772,7 @@ gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk + } -- Gitblit v1.8.0