From 9e875b253959eff8f6af567308ad804fe69d0a62 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 03 十一月 2023 18:04:57 +0800
Subject: [PATCH] 2023年11月03日18:04:44
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 9cd92de..607bb82 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -79,6 +79,26 @@
}
/**
+ * 鑾峰彇褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣ㄥ垪琛�
+ */
+ public GatewayBean getCurrentHomeMainGateway() {
+ List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
+ if (list.size() > 0) {
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
+ continue;
+ }
+ if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ //鎵惧埌杩斿洖
+ return gatewayBean;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
* 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠(鍖呮嫭:sid锛宱id)
*
* @param mac 璁惧mac
@@ -522,7 +542,7 @@
/**
* 鑾峰彇閫嗗彉鍣ㄥ垪琛�
- * 娉ㄦ剰:鏈夊缃戜互浜戠璁惧涓哄噯,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戜互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
+ * 娉ㄦ剰:鏈夊缃戜互浜戠璁惧涓哄噯;鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戜互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
*
* @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
*/
@@ -682,7 +702,6 @@
* @param spk spk
* @param mac 璁惧mac
* @param cloudCallBeak 鍥炶皟
- * @return -
*/
public void getDeviceRemoteInfo(String homeId, String spk, String mac, CloudCallBeak<DeviceRemoteInfo> cloudCallBeak) {
String requestUrl = HttpApi.POST_Device_RemoteInfo;
@@ -794,7 +813,7 @@
if (deviceRemoteInfo != null) {
gatewayBean.setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜
gatewayBean.setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
- //鐢ㄤ箣鍓嶇殑搴�,搴曞眰mqtt璁㈤槄锛屽姞瑙ｅ瘑浼氱敤鍒拌鍙傛暟;
+ //todo 璁剧疆鍒般�愬簱銆戦噷闈�,搴曞眰mqtt璁㈤槄锛屽姞瑙ｅ瘑浼氱敤鍒拌鍙傛暟;
HDLLinkConfig.getInstance().setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜搴�
HDLLinkConfig.getInstance().setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
--
Gitblit v1.8.0