From 0f91b37f7711481b9671409d0de08873d77060eb Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 20 十二月 2023 17:24:31 +0800
Subject: [PATCH] 2023年12月20日17:24:20
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 126 ++++++++++++++++++++++++++++-------------
1 files changed, 86 insertions(+), 40 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 b6834cd..4cbf8e2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -6,22 +6,7 @@
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
-import com.hdl.hdlhttp.HxHttp;
-import com.hdl.linkpm.sdk.core.api.HDLCloudHomeApi;
-import com.hdl.linkpm.sdk.core.callback.IDefaultCallBack;
-import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
import com.hdl.linkpm.sdk.core.exception.HDLException;
-import com.hdl.linkpm.sdk.core.response.HDLResponse;
-import com.hdl.linkpm.sdk.device.bean.DeviceOidInfoBean;
-import com.hdl.linkpm.sdk.device.bean.GatewayCloudBean;
-import com.hdl.linkpm.sdk.ota.HDLLinkPMOta;
-import com.hdl.linkpm.sdk.ota.bean.CloudDeviceFirmwaresBean;
-import com.hdl.linkpm.sdk.ota.bean.CloudGatewayDriversBean;
-import com.hdl.linkpm.sdk.ota.bean.DeviceFirmwareBean;
-import com.hdl.linkpm.sdk.ota.bean.DownloadUrlBean;
-import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean;
-import com.hdl.linkpm.sdk.project.HDLLinkPMProject;
-import com.hdl.linkpm.sdk.utils.HDLExceptionSubmitUtils;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
@@ -35,6 +20,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;
@@ -44,15 +30,11 @@
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import com.hdl.sdk.link.gateway.type.GatewayMasterType;
-import org.json.JSONException;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-
-import io.dcloud.feature.unimp.DCUniMPJSCallback;
-import io.reactivex.rxjava3.disposables.Disposable;
/**
@@ -79,7 +61,7 @@
}
/**
- * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�
+ * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�(鍖呮嫭浠庣殑閫嗗彉鍣�)
*/
public List<GatewayBean> getCurrentHomeGatewayList() {
List<GatewayBean> newList = new ArrayList<>();
@@ -103,17 +85,26 @@
* 鑾峰彇褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣ㄥ垪琛�
*/
public GatewayBean getCurrentHomeMainGateway() {
- List<GatewayBean> list = this.getCurrentHomeGatewayList();
- if (list.size() > 0) {
- for (int i = 0; i < list.size(); i++) {
- GatewayBean gatewayBean = list.get(i);
- if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue)) {
- //鎵惧埌杩斿洖
- 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;
}
@@ -361,7 +352,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) {
@@ -566,7 +557,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:鏈夊眬鍩熺綉锛屾病鏈夊缃�);
@@ -675,6 +666,7 @@
//浜戠涔熸病鏈夐�嗗彉鍣ㄥ垪琛�,杩斿洖绌哄垪琛ㄥ洖鍘�
cloudCallBeak.onSuccess(new ArrayList<>());
}
+ HdlLogLogic.print("鍦ㄥ彧鏈夈�愬缃戙�戞儏鍐典笅鑾峰彇浜戠閫嗗彉鍣ㄥ垪琛ㄨ繑鍥炵┖鍒楄〃", true);
return;
}
//璁板綍鏉℃暟
@@ -682,6 +674,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
@@ -812,24 +805,65 @@
/**
* 鎼滅储閫嗗彉鍣ㄥ垪琛�
+ * 娉ㄦ剰:鍙悳绱㈠綋鍓嶄綇瀹呴�嗗彉鍣ㄥ拰娌℃湁琚粦瀹氱殑閫嗗彉鍣�
*
* @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 deviceMac 璁惧mac
- * @return true=鏈湴杩炴帴
+ * @param gatewayCallBack -
*/
- public boolean isLocalConnect(String deviceMac) {
- GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(deviceMac);
- return gatewayBean == null;
+ public void searchAllGateway(GatewayCallBack gatewayCallBack) {
+ //缃戝叧鎼滅储
+ HDLLinkLocalSdk.getInstance().refreshGateway(gatewayCallBack, this.getGatewaySpk());
+ }
+
+ /**
+ * 妫�娴嬫湰鍦拌繛鎺ョ姸鎬�
+ *
+ * @param deviceMac 璁惧mac锛�
+ * @param callBeak 杩斿洖 true=鏈湴杩炴帴;false=杩滅▼;
+ */
+ public void isLocalConnect(String deviceMac, CloudCallBeak<Boolean> callBeak) {
+ searchCurrentHomeGateway(new GatewayCallBack() {
+ @Override
+ public void onSuccess(List<GatewayBean> gatewayBeanList) {
+
+ if (gatewayBeanList == null || gatewayBeanList.size() == 0) {
+ if (callBeak != null) {
+ callBeak.onSuccess(false);
+ }
+ return;
+ }
+ boolean is_find = false;
+ for (int i = 0; i < gatewayBeanList.size(); i++) {
+ GatewayBean gatewayBean = gatewayBeanList.get(i);
+ if (gatewayBean.getDevice_mac().equals(deviceMac)) {
+ is_find = true;
+ break;
+ }
+
+ }
+ if (callBeak != null) {
+ callBeak.onSuccess(is_find);
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ if (callBeak != null) {
+ callBeak.onSuccess(false);
+ }
+ }
+ });
}
/**
@@ -905,7 +939,7 @@
gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵��
gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙�
gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О
- gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�
+ gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�,閫嗗彉鍣ㄥ湴鍧�
gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
@@ -920,11 +954,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