From 6e418105015e0ca91fe2240bb4a3584fd165ddd7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 10 十月 2023 17:28:23 +0800
Subject: [PATCH] 2023年10月10日17:28:19
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 200 +++++++++++++++++++++++++++++--------------------
1 files changed, 118 insertions(+), 82 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 2db7010..0986533 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -6,47 +6,32 @@
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.IResponseCallBack;
import com.hdl.linkpm.sdk.core.exception.HDLException;
-import com.hdl.linkpm.sdk.core.response.HDLResponse;
-import com.hdl.linkpm.sdk.device.bean.FunctionInfoBean;
-import com.hdl.linkpm.sdk.utils.HDLExceptionSubmitUtils;
-import com.hdl.photovoltaic.bean.HttpResponsePack;
-import com.hdl.photovoltaic.bean.LocalResponse;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.TcpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.internet.api.TopicApi;
-import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.ui.bean.CloudInverterChildDeviceBean;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
-import com.hdl.photovoltaic.ui.bean.InverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
-import com.hdl.photovoltaic.uni.HDLUniMP;
-import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
-import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
-import com.hdl.sdk.link.core.bean.request.BaseLocalRequest;
import com.hdl.sdk.link.core.bean.response.BaseLocalResponse;
import com.hdl.sdk.link.core.callback.GatewayCallBack;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
+import com.hdl.sdk.link.gateway.type.GatewayMasterType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-
-import io.reactivex.rxjava3.disposables.Disposable;
/**
@@ -54,27 +39,6 @@
*/
public class HdlDeviceLogic {
private static volatile HdlDeviceLogic sHdlDeviceLogic;
-
- /**
- * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�
- */
- public List<GatewayBean> getGatewayList() {
- List<GatewayBean> newList = new ArrayList<>();
- 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("true")
- && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
- newList.add(gatewayBean);
- }
- }
- }
- return newList;
- }
/**
* 鑾峰彇褰撳墠瀵硅薄
@@ -91,6 +55,60 @@
}
return sHdlDeviceLogic;
+ }
+
+ /**
+ * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�
+ */
+ public List<GatewayBean> getCurrentHomeGatewayList() {
+ List<GatewayBean> newList = new ArrayList<>();
+ 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())) {
+ newList.add(gatewayBean);
+ }
+ }
+ }
+ return newList;
+ }
+
+ /**
+ * 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠(鍖呮嫭:sid锛宱id)
+ *
+ * @param mac 璁惧mac
+ */
+ public void uploadDataToCloud(String mac, CloudCallBeak<Boolean> callBeak) {
+ getInverterOidList(mac, new LinkCallBack<List<OidBean>>() {
+ @Override
+ public void onSuccess(List<OidBean> obj) {
+ if (obj == null) {
+ return;
+ }
+ fullUpdateOid(obj, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+
+ }
+ });
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+
+ }
+ });
+
}
/**
@@ -121,30 +139,7 @@
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
//涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔�
- getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
- @Override
- public void onSuccess(List<OidBean> obj) {
- if (obj == null) {
- return;
- }
- fullUpdateOid(obj, new CloudCallBeak<Boolean>() {
- @Override
- public void onSuccess(Boolean obj) {
-
- }
-
- @Override
- public void onFailure(HDLException e) {
-
- }
- });
- }
-
- @Override
- public void onError(HDLLinkException e) {
-
- }
- });
+ uploadDataToCloud(mac, null);
}
}
@@ -196,7 +191,7 @@
/**
- * 鍒犻櫎閫嗗彉鍣�
+ * 鍒犻櫎浜戠涓婇�嗗彉鍣�
*
* @param deviceId 璁惧id
* @param cloudCallBeak 鍥炶皟
@@ -419,7 +414,7 @@
public void editGatewayParam(String mac, LinkCallBack<Boolean> linkCallBack) {
String requestUrl = TopicApi.SET_GATEWAY_EDIT;
JsonObject json = new JsonObject();
- json.addProperty("master", "true");
+ json.addProperty("master", GatewayMasterType.MasterTrue);
TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
@@ -473,12 +468,12 @@
}
/**
- * 鑾峰彇缃戝叧oid鍒楄〃
+ * 鑾峰彇閫嗗彉鍣╫id鍒楄〃
*
* @param mac 缃戝叧mac
* @param linkCallBack 鍥炶皟
*/
- public void getGatewayOidList(String mac, LinkCallBack<List<OidBean>> linkCallBack) {
+ public void getInverterOidList(String mac, LinkCallBack<List<OidBean>> linkCallBack) {
String requestUrl = TopicApi.GET_GATEWAY_OID_LIST;
TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
@Override
@@ -515,15 +510,16 @@
}
/**
- * 鑾峰彇鏈湴閫嗗彉鍣ㄥ垪琛�
+ * 鑾峰彇閫嗗彉鍣ㄥ垪琛�
* 娉ㄦ剰:鏈夊缃戜互浜戠璁惧涓哄噯,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戜互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
*
- * @param cloudCallBeak -
+ * @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
*/
- public void getLocalGatewayList(CloudCallBeak<Boolean> cloudCallBeak) {
+ public void getCurrentHomeLocalAndCloudGatewayList(CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
+ //灞�鍩熺綉鎯呭喌
HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterDeviceBean> list) {
@@ -531,7 +527,7 @@
// //浜戠娌℃湁缁戝畾閫嗗彉鍣�,浠ユ湰鍦颁负涓�;
// HDLLinkLocalGateway.getInstance().getGatewayList().clear();
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
}
return;
}
@@ -560,10 +556,10 @@
}
for (int i = 0; i < removeSidList.size(); i++) {
//鍒犻櫎鏈湴鐨勯�嗗彉鍣�
- removeInverter(removeSidList.get(i));
+ removeLocalInverter(removeSidList.get(i));
}
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
}
}
}
@@ -588,10 +584,10 @@
}
for (int i = 0; i < removeSidList.size(); i++) {
//鍒犻櫎鏈湴鐨勯�嗗彉鍣�
- removeInverter(removeSidList.get(i));
+ removeLocalInverter(removeSidList.get(i));
}
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
}
}
HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
@@ -613,15 +609,15 @@
@Override
public void onError(HDLLinkException e) {
+ //澶栫綉鎯呭喌
HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterDeviceBean> list) {
- //娓呮鏈湴缃戝叧鍒楄〃
+ //浜戠娌℃湁,娓呯┖鏈湴閫嗗彉鍣ㄥ垪琛�
HDLLinkLocalGateway.getInstance().getGatewayList().clear();
-
if (list == null || list.size() == 0) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
}
return;
}
@@ -636,7 +632,7 @@
refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo);
if (atomicInteger.get() == list.size()) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
}
}
}
@@ -646,7 +642,7 @@
atomicInteger.set(atomicInteger.get() + 1);
if (atomicInteger.get() == list.size()) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
}
}
HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
@@ -678,7 +674,7 @@
* @return -
*/
public void getDeviceRemoteInfo(String homeId, String spk, String mac, CloudCallBeak<DeviceRemoteInfo> cloudCallBeak) {
- String requestUrl = HttpApi.POST_Device_remoteInfo;
+ String requestUrl = HttpApi.POST_Device_RemoteInfo;
JsonObject json = new JsonObject();
json.addProperty("homeId", homeId);
json.addProperty("spk", spk);
@@ -713,7 +709,7 @@
*
* @param sid 璁惧sid
*/
- private void removeInverter(String sid) {
+ private void removeLocalInverter(String sid) {
GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(sid);
if (gatewayBean != null) {
HDLLinkLocalGateway.getInstance().getGatewayList().remove(gatewayBean);
@@ -721,7 +717,41 @@
}
/**
- * 鎼滅储缃戝叧鍒楄〃
+ * 娓呯┖閫嗗彉鍣ㄤ綇瀹卛d
+ *
+ * @param mac mac
+ */
+ public void clearInverterHomeId(String mac, LinkCallBack<Boolean> callBeak) {
+ String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId","");
+ json.addProperty("server_addr", "");
+ TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
+ if (gatewayBean != null) {
+ if (!TextUtils.isEmpty(UserConfigManage.getInstance().getLocalSecret())) {
+ gatewayBean.setLocalEncrypt(true);
+ }
+ }
+ if (callBeak != null) {
+ callBeak.onSuccess(true);
+ }
+
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ if (callBeak != null) {
+ callBeak.onError(e);
+ }
+ }
+ });
+ }
+
+ /**
+ * 鎼滅储閫嗗彉鍣ㄥ垪琛�
*
* @param gatewayCallBack -
*/
@@ -752,6 +782,10 @@
if (deviceRemoteInfo != null) {
gatewayBean.setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜
gatewayBean.setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
+ //鐢ㄤ箣鍓嶇殑搴�,搴曞眰mqtt璁㈤槄锛屽姞瑙ｅ瘑浼氱敤鍒拌鍙傛暟;
+ HDLLinkConfig.getInstance().setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜搴�
+ HDLLinkConfig.getInstance().setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
+
}
gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());//浣忓畢id
gatewayBean.setDeviceStatus(cloudInverterDeviceBean.getDeviceStatus());//璁剧疆缃戝叧鐘舵��
@@ -762,13 +796,15 @@
gatewayBean.setDevice_name(cloudInverterDeviceBean.getName());//璁惧鍚嶇О
gatewayBean.setGatewayType(cloudInverterDeviceBean.getSpk());//璁剧疆spk
gatewayBean.setLocalEncrypt(true);
- gatewayBean.setMaster("true");
+ gatewayBean.setMaster(GatewayMasterType.MasterTrue);
gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵��
gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙�
gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О
gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�
gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
+ gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
+
}
--
Gitblit v1.8.0