From 4cd6e3cea73a57f9a4c73232b27c9054ac599b05 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 12 十二月 2023 14:51:03 +0800
Subject: [PATCH] 2023年12月12日14:50:56
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 91a8140..414c268 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -35,6 +35,7 @@
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.bean.response.BaseLocalResponse;
@@ -370,7 +371,7 @@
json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
json.addProperty("server_addr", AppConfigManage.getUserRegionUrl());
json.addProperty("local_secret", UserConfigManage.getInstance().getLocalSecret());
- //瑙ｅ瘑璐熻浇鏁版嵁(鍥犱负鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槑鏂囷紝鍥犱负閭ｆ椂缃戝叧杩樻病鏈夊瘑閽�)
+ //瑙ｅ瘑璐熻浇鏁版嵁(鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槸鏄庢枃锛屽洜涓洪偅鏃剁綉鍏宠繕娌℃湁瀵嗛挜)
TcpClient.getInstance().sendDataToLinkGateway(mac, false, requestUrl, json, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
@@ -575,7 +576,7 @@
* @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
*/
public void getCurrentHomeLocalAndCloudGatewayList(CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
- HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
+ HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
//灞�鍩熺綉鏈�2绉嶆儏鍐�(1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�2:鏈夊眬鍩熺綉锛屾病鏈夊缃�);
@@ -821,13 +822,25 @@
/**
* 鎼滅储閫嗗彉鍣ㄥ垪琛�
+ * 娉ㄦ剰:鍙悳绱㈠綋鍓嶄綇瀹呴�嗗彉鍣ㄥ拰娌℃湁琚粦瀹氱殑閫嗗彉鍣�
*
* @param gatewayCallBack -
*/
- public void searchGateway(GatewayCallBack gatewayCallBack) {
+ public void searchCurrentHomeGateway(GatewayCallBack gatewayCallBack) {
List<String> spks = this.getGatewaySpk();
//缃戝叧鎼滅储
HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack);
+ }
+
+ /**
+ * 鎼滅储灞�鍩熺綉鎵�鏈夐�嗗彉鍣ㄥ垪琛�
+ * 娉ㄦ剰:鍖呮嫭宸茬粡琚粦瀹氬埌浣忓畢鐨勯�嗗彉鍣�
+ *
+ * @param gatewayCallBack -
+ */
+ public void searchAllGateway(GatewayCallBack gatewayCallBack) {
+ //缃戝叧鎼滅储
+ HDLLinkLocalSdk.getInstance().refreshGateway(gatewayCallBack, this.getGatewaySpk());
}
/**
@@ -929,11 +942,23 @@
*
* @return -
*/
- private List<String> getGatewaySpk() {
+ public List<String> getGatewaySpk() {
List<String> spks = new ArrayList<>();
spks.add(DEVICE_SPK);
return spks;
}
+ public boolean isGatewaySpk(String spk) {
+ if (TextUtils.isEmpty(spk)) {
+ return false;
+ }
+ for (int i = 0; i < this.getGatewaySpk().size(); i++) {
+ if (this.getGatewaySpk().get(i).equals(spk)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public final String DEVICE_SPK = "energy.hdl_inverter";
}
--
Gitblit v1.8.0