From d830fef6a2bc2ab061e6ac2b423c4a49dda3cf21 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 06 十二月 2023 18:08:26 +0800
Subject: [PATCH] 2023年12月06日18:08:20
---
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 49 +++++++++++++++++++------------------------------
1 files changed, 19 insertions(+), 30 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 c4322ac..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());//浠婂ぉ鍙戠數閲�
@@ -514,43 +515,31 @@
*/
public void switchHouse(HouseIdBean houseIdBean) {
String oidHomeId = UserConfigManage.getInstance().getHomeId();
-// if (houseIdBean.getHomeId().equals(oidHomeId)) {
-// return;
-// }
-
- //鍒犻櫎鏃х殑浣忓畢鏂囦欢澶�
- HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentHomeRootPath());
+ if (houseIdBean.getHomeId().equals(oidHomeId)) {
+ HdlLogLogic.print("鐐瑰嚮鍚屼竴涓綇瀹�");
+ return;
+ }
+ //璁㈤槄瑕佸叏閮ㄥ彇娑�
+ 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());
- //閲嶆柊鍒涘缓浣忓畢鏂囦欢澶�
- HdlFileLogic.getInstance().createDirectory();
//閰嶇疆鏈湴閫氫俊鐨勪俊鎭�
- initLocalLinkSdk();
-
- HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
- @Override
- public void onSuccess(List<GatewayBean> gatewayBeanList) {
- }
-
- @Override
- public void onError(HDLLinkException e) {
- }
- });
- }
-
-
- /**
- * 閰嶇疆鏈湴閫氫俊鐨勪俊鎭�(tcp閫氫俊鐢ㄥ埌)
- */
- private void initLocalLinkSdk() {
HDLLinkConfig.getInstance().setHomeId(UserConfigManage.getInstance().getHomeId());
HDLLinkConfig.getInstance().setLocalSecret(UserConfigManage.getInstance().getLocalSecret());
-
-
+ //閲嶆柊鍒涘缓浣忓畢鏂囦欢澶�
+ HdlFileLogic.getInstance().createDirectory();
+ //杩涘幓浣忓畢璇︽儏鎼滅储涓�涓嬮�嗗彉鍣ㄥ垪琛�,鐩殑鏄缓绔嬮�氳閫氶亾;
+ HdlDeviceLogic.getInstance().searchGateway(null);
}
-
static class HouseBeanClass {
--
Gitblit v1.8.0