From 2a6c0d9a93923f852a90f9f53f5e75985ad5bf73 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 14 十二月 2023 09:52:10 +0800
Subject: [PATCH] 2023年12月14日09:51:57
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 67 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 17 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 046f812..f18db41 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;
@@ -79,7 +80,7 @@
}
/**
- * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�
+ * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�(鍖呮嫭浠庣殑閫嗗彉鍣�)
*/
public List<GatewayBean> getCurrentHomeGatewayList() {
List<GatewayBean> newList = new ArrayList<>();
@@ -103,20 +104,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 queryCurrentHomeMainGateway(this.getCurrentHomeGatewayList());
+ }
+
+ /**
+ * 鏌ヨ褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣ㄥ垪琛�
+ */
+ public GatewayBean queryCurrentHomeMainGateway(List<GatewayBean> list) {
+ if (list == null || list.size() == 0) {
+ return null;
+ }
+ GatewayBean findGatewayBean = null;
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ //鎵惧埌杩斿洖
+ findGatewayBean = gatewayBean;
+ break;
}
}
- return null;
+ return findGatewayBean;
}
@@ -364,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) {
@@ -569,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:鏈夊眬鍩熺綉锛屾病鏈夊缃�);
@@ -678,6 +685,7 @@
//浜戠涔熸病鏈夐�嗗彉鍣ㄥ垪琛�,杩斿洖绌哄垪琛ㄥ洖鍘�
cloudCallBeak.onSuccess(new ArrayList<>());
}
+ HdlLogLogic.print("鍦ㄥ彧鏈夈�愬缃戙�戞儏鍐典笅鑾峰彇浜戠閫嗗彉鍣ㄥ垪琛ㄨ繑鍥炵┖鍒楄〃",true);
return;
}
//璁板綍鏉℃暟
@@ -685,6 +693,7 @@
for (int i = 0; i < list.size(); i++) {
CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+
//鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
@Override
@@ -815,13 +824,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());
}
/**
@@ -923,11 +944,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