From 6002cb9371055af6d37c8581d207cf6e3d0f9a4a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 29 六月 2023 10:33:28 +0800
Subject: [PATCH] 2023年06月29日10:33:22
---
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 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 fcdf6ec..54a63fe 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -12,6 +12,10 @@
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
+import com.hdl.sdk.link.common.exception.HDLLinkException;
+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 java.util.ArrayList;
import java.util.List;
@@ -502,21 +506,44 @@
/**
* 鍒囨崲浣忓畢
*
- * @param homeId 浣忓畢id
+ * @param houseIdBean 浣忓畢Id瀵硅薄
*/
- public Boolean switchHouse(String homeId) {
+ public void switchHouse(HouseIdBean houseIdBean) {
String oidHomeId = UserConfigManage.getInstance().getHomeId();
+ if (houseIdBean.getHomeId().equals(oidHomeId)) {
+ return;
+ }
+ //鍒犻櫎鏃х殑浣忓畢鏂囦欢澶�
HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentHomeRootPath());
- UserConfigManage.getInstance().setHomeId(homeId);
+ //閲嶆柊璁剧疆浣忓畢id
+ UserConfigManage.getInstance().setHomeId(houseIdBean.getHomeId());
+ //閲嶆柊璁剧疆鏈湴閫氳绉橀挜
+ UserConfigManage.getInstance().setLocalSecret(houseIdBean.getLocalSecret());
+ //閲嶆柊鍒涘缓浣忓畢鏂囦欢澶�
HdlFileLogic.getInstance().createDirectory();
-
- HdlThreadLogic.runThread(new Runnable() {
+ //閰嶇疆鏈湴閫氫俊鐨勪俊鎭�
+ initLocalLinkSdk();
+ HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
@Override
- public void run() {
- //鎼滅储涓�涓嬩綇瀹呰澶�
+ public void onSuccess(List<GatewayBean> gatewayBeanList) {
+
}
- }, null, null);
- return true;
+
+ @Override
+ public void onError(HDLLinkException e) {
+
+ }
+ });
+
+ }
+
+ /**
+ * 閰嶇疆鏈湴閫氫俊鐨勪俊鎭�(tcp閫氫俊鐢ㄥ埌)
+ */
+ private void initLocalLinkSdk() {
+ HDLLinkConfig.getInstance().setHomeId(UserConfigManage.getInstance().getHomeId());
+ HDLLinkConfig.getInstance().setLocalSecret(UserConfigManage.getInstance().getLocalSecret());
+
}
--
Gitblit v1.8.0