From 907f9314657fd0554fecda06e919b98768b0aeea Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 11 十月 2023 18:00:56 +0800
Subject: [PATCH] 2023年10月11日18:00:50
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 122 +++++++++++++++++++++++++---------------
1 files changed, 76 insertions(+), 46 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 037b4bf..aa79f49 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -6,35 +6,21 @@
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;
@@ -46,8 +32,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-
-import io.reactivex.rxjava3.disposables.Disposable;
/**
@@ -94,6 +78,38 @@
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) {
+
+ }
+ });
+
+ }
/**
* 娣诲姞閫嗗彉鍣ㄥ埌浜戠涓�
@@ -123,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);
}
}
@@ -198,7 +191,7 @@
/**
- * 鍒犻櫎閫嗗彉鍣�
+ * 鍒犻櫎浜戠涓婇�嗗彉鍣�
*
* @param deviceId 璁惧id
* @param cloudCallBeak 鍥炶皟
@@ -475,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
@@ -563,7 +556,7 @@
}
for (int i = 0; i < removeSidList.size(); i++) {
//鍒犻櫎鏈湴鐨勯�嗗彉鍣�
- removeInverter(removeSidList.get(i));
+ removeLocalInverter(removeSidList.get(i));
}
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
@@ -591,7 +584,7 @@
}
for (int i = 0; i < removeSidList.size(); i++) {
//鍒犻櫎鏈湴鐨勯�嗗彉鍣�
- removeInverter(removeSidList.get(i));
+ removeLocalInverter(removeSidList.get(i));
}
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
@@ -716,11 +709,45 @@
*
* @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);
}
+ }
+
+ /**
+ * 娓呯┖閫嗗彉鍣ㄤ綇瀹卛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);
+ }
+ }
+ });
}
/**
@@ -776,6 +803,9 @@
gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�
gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
+ gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
+ gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
+
}
--
Gitblit v1.8.0