From b2d2e6dcf6ec38a2f24721f2bc925d634a6eb78d Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 05 十二月 2023 18:31:01 +0800 Subject: [PATCH] 2023年12月05日18:30:40 --- app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java index 5be1e09..6dd0118 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java @@ -20,6 +20,7 @@ import com.hdl.sdk.link.core.bean.gateway.GatewayBean; import com.hdl.sdk.link.core.callback.GatewayCallBack; import com.hdl.sdk.link.core.config.HDLLinkConfig; +import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient; import com.hdl.sdk.link.gateway.HDLLinkLocalGateway; import java.nio.charset.StandardCharsets; @@ -114,7 +115,7 @@ public void onSuccess(HouseInfoBean houseInfoBean) { atomicInteger.set(atomicInteger.get() + 1); if (houseInfoBean != null) { - houseInfoBean.setHomeImage(houseIdBean.getHomeImage());//鐢电珯鍥剧墖 + houseInfoBean.setPowerStationImage(houseIdBean.getPowerStationImage());//鐢电珯鍥剧墖 houseInfoBean.setInstalledCapacity(houseIdBean.getInstalledCapacity());//瑁呮満瀹归噺 houseInfoBean.setPower(houseIdBean.getPower());//鍙戠數鍔熺巼 houseInfoBean.setTodayElectricity(houseIdBean.getTodayElectricity());//浠婂ぉ鍙戠數閲� @@ -518,10 +519,17 @@ HdlLogLogic.print("鐐瑰嚮鍚屼竴涓綇瀹�"); return; } - //鍒犻櫎鏃х殑浣忓畢鏂囦欢澶� - HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentHomeRootPath()); + //璁㈤槄瑕佸叏閮ㄥ彇娑� + if (MqttRecvClient.getInstance() != null) { + MqttRecvClient.getInstance().removeAllTopic(); + } + //瑕佹竻绌轰箣鍓峵cp杩炴帴缂撳瓨 + //TODO: 10/10/23 + //鍒犻櫎鏃х殑浣忓畢鏂囦欢澶� 2023骞�11鏈�03鏃�14:28:19鏆傛椂鍘绘帀 +// HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentHomeRootPath()); //閲嶆柊璁剧疆浣忓畢id UserConfigManage.getInstance().setHomeId(houseIdBean.getHomeId()); + UserConfigManage.getInstance().setHomeName(houseIdBean.getHomeName()); //閲嶆柊璁剧疆鏈湴閫氳绉橀挜 UserConfigManage.getInstance().setLocalSecret(houseIdBean.getLocalSecret()); //閰嶇疆鏈湴閫氫俊鐨勪俊鎭� -- Gitblit v1.8.0