From ebf1b9c813030a366bdc8967d2788eba3f3d9b5a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 21 八月 2023 13:18:58 +0800
Subject: [PATCH] 2023年08月21日13:18:56
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 234 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 117 insertions(+), 117 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 08d8f54..df1ced3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -7,6 +7,7 @@
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.hdlhttp.HxHttp;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.bean.HttpResponsePack;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
@@ -16,6 +17,7 @@
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.InverterDeviceBean;
@@ -42,6 +44,26 @@
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.getHomeId())
+ && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ newList.add(gatewayBean);
+ }
+
+ }
+ }
+ return newList;
+
+ }
+
+ /**
* 鑾峰彇褰撳墠瀵硅薄
*
* @return HdlDeviceLogic
@@ -66,7 +88,7 @@
* @param sid -
* @param oid -
* @param name -
- * @param cloudCallBeak
+ * @param cloudCallBeak -
*/
public void addInverterDeviceToCloud(String mac, String spk, String sid, String oid, String name, CloudCallBeak<Boolean> cloudCallBeak) {
@@ -80,18 +102,18 @@
json.addProperty("name", name);
// json.addProperty("zoneType", "password");//鍖哄煙
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
- public void onSuccess(HttpResponsePack httpResponsePack) {
+ public void onSuccess(String str) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
}
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException e) {
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(exception);
+ cloudCallBeak.onFailure(e);
}
}
});
@@ -109,29 +131,24 @@
json.addProperty("homeId", homeId);
// json.addProperty("zoneType", "password");//鍖哄煙
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
- public void onSuccess(HttpResponsePack httpResponsePack) {
- try {
- if (httpResponsePack != null && httpResponsePack.getData() != null) {
- Gson gson = new Gson();
- String json = gson.toJson(httpResponsePack.getData());
- Type type = new TypeToken<List<CloudInverterDeviceBean>>() {
- }.getType();
- List<CloudInverterDeviceBean> list = new Gson().fromJson(json, type);
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(list);
- }
- }
- } catch (Exception e) {
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
+ cloudCallBeak.onSuccess(null);
}
+ }
+ Type type = new TypeToken<List<CloudInverterDeviceBean>>() {
+ }.getType();
+ List<CloudInverterDeviceBean> list = new Gson().fromJson(jsonStr, type);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(list);
}
}
@Override
- public void onFailure(Exception e) {
+ public void onFailure(HDLException e) {
if (cloudCallBeak != null) {
cloudCallBeak.onFailure(e);
}
@@ -153,18 +170,18 @@
json.addProperty("deviceId", deviceId);
// json.addProperty("zoneType", "password");//鍖哄煙
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
- public void onSuccess(HttpResponsePack httpResponsePack) {
+ public void onSuccess(String str) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
}
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException e) {
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(exception);
+ cloudCallBeak.onFailure(e);
}
}
});
@@ -183,25 +200,28 @@
json.addProperty("parentOid", parentOid);
// json.addProperty("zoneType", "password");//鍖哄煙
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
- public void onSuccess(HttpResponsePack httpResponsePack) {
- if (httpResponsePack != null && httpResponsePack.getData() != null) {
- Gson gson = new Gson();
- String json = gson.toJson(httpResponsePack.getData());
- Type typeOfT = new TypeToken<List<CloudInverterChildDeviceBean>>() {
- }.getType();
- List<CloudInverterChildDeviceBean> list = gson.fromJson(json, typeOfT);
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(list);
+ cloudCallBeak.onSuccess(null);
}
+ return;
+ }
+ Gson gson = new Gson();
+ Type typeOfT = new TypeToken<List<CloudInverterChildDeviceBean>>() {
+ }.getType();
+ List<CloudInverterChildDeviceBean> list = gson.fromJson(jsonStr, typeOfT);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(list);
}
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException e) {
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(exception);
+ cloudCallBeak.onFailure(e);
}
}
});
@@ -236,9 +256,9 @@
json.add("devices", jsonArray);
// json.addProperty("zoneType", "password");//鍖哄煙
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
- public void onSuccess(HttpResponsePack httpResponsePack) {
+ public void onSuccess(String str) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
@@ -247,9 +267,9 @@
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException e) {
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(exception);
+ cloudCallBeak.onFailure(e);
}
}
});
@@ -260,10 +280,10 @@
/**
* 璁剧疆缃戝叧杩滅▼鍙傛暟
*
- * @param mac 璁惧mac
- * @param cloudCallBeak 鍥炶皟update
+ * @param mac 璁惧mac
+ * @param linkCallBack 鍥炶皟update
*/
- public void steGatewayParam(String mac, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void setGatewayRemoteParam(String mac, LinkCallBack<Boolean> linkCallBack) {
String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
JsonObject json = new JsonObject();
json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
@@ -279,16 +299,16 @@
gatewayBean.setLocalEncrypt(true);
}
}
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
+ if (linkCallBack != null) {
+ linkCallBack.onSuccess(true);
}
}
@Override
public void onError(HDLLinkException e) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
+ if (linkCallBack != null) {
+ linkCallBack.onError(e);
}
}
});
@@ -297,25 +317,25 @@
/**
* 缂栬緫缃戝叧鍙傛暟
*
- * @param mac 璁惧mac
- * @param cloudCallBeak 鍥炶皟update
+ * @param mac 璁惧mac
+ * @param linkCallBack 鍥炶皟update
*/
- public void editGatewayParam(String mac, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void editGatewayParam(String mac, LinkCallBack<Boolean> linkCallBack) {
String requestUrl = TopicApi.SET_GATEWAY_EDIT;
JsonObject json = new JsonObject();
json.addProperty("master", "true");
TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
+ if (linkCallBack != null) {
+ linkCallBack.onSuccess(true);
}
}
@Override
public void onError(HDLLinkException e) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
+ if (linkCallBack != null) {
+ linkCallBack.onError(e);
}
}
});
@@ -326,39 +346,31 @@
/**
* 鑾峰彇缃戝叧璇︽儏淇℃伅
*
- * @param mac 缃戝叧mac
- * @param cloudCallBeak 鍥炶皟
+ * @param mac 缃戝叧mac
+ * @param linkCallBack 鍥炶皟
*/
- public void getGatewayInfo(String mac, CloudCallBeak<GatewayBean> cloudCallBeak) {
+ public void getGatewayInfo(String mac, LinkCallBack<GatewayBean> linkCallBack) {
String requestUrl = TopicApi.GET_GATEWAY_INFO;
TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
@Override
- public void onSuccess(String msg) {
- try {
- if (!TextUtils.isEmpty(msg)) {
- Gson gson = new Gson();
- String json = gson.toJson(msg);
- GatewayBean gatewayBean = gson.fromJson(json, GatewayBean.class);
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(gatewayBean);
- }
- } else {
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(new GatewayBean());
- }
+ public void onSuccess(String json) {
+ if (TextUtils.isEmpty(json)) {
+ if (linkCallBack != null) {
+ linkCallBack.onSuccess(null);
}
-
- } catch (Exception e) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
- }
+ return;
+ }
+ Gson gson = new Gson();
+ GatewayBean gatewayBean = gson.fromJson(json, GatewayBean.class);
+ if (linkCallBack != null) {
+ linkCallBack.onSuccess(gatewayBean);
}
}
@Override
public void onError(HDLLinkException e) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
+ if (linkCallBack != null) {
+ linkCallBack.onError(e);
}
}
});
@@ -368,41 +380,33 @@
/**
* 鑾峰彇缃戝叧oid鍒楄〃
*
- * @param mac 缃戝叧mac
- * @param cloudCallBeak 鍥炶皟
+ * @param mac 缃戝叧mac
+ * @param linkCallBack 鍥炶皟
*/
- public void getGatewayOidList(String mac, CloudCallBeak<List<OidBean>> cloudCallBeak) {
+ public void getGatewayOidList(String mac, LinkCallBack<List<OidBean>> linkCallBack) {
String requestUrl = TopicApi.GET_GATEWAY_OID_LIST;
TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
@Override
- public void onSuccess(String msg) {
- try {
- if (!TextUtils.isEmpty(msg)) {
- Gson gson = new Gson();
- String json = gson.toJson(msg);
- Type typeOfT = new TypeToken<List<OidBean>>() {
- }.getType();
- List<OidBean> list = gson.fromJson(json, typeOfT);
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(list);
- }
- } else {
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(new ArrayList<>());
- }
+ public void onSuccess(String json) {
+ if (TextUtils.isEmpty(json)) {
+ if (linkCallBack != null) {
+ linkCallBack.onSuccess(null);
}
-
- } catch (Exception e) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
- }
+ return;
+ }
+ Gson gson = new Gson();
+ Type typeOfT = new TypeToken<List<OidBean>>() {
+ }.getType();
+ List<OidBean> list = gson.fromJson(json, typeOfT);
+ if (linkCallBack != null) {
+ linkCallBack.onSuccess(list);
}
}
@Override
public void onError(HDLLinkException e) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
+ if (linkCallBack != null) {
+ linkCallBack.onError(e);
}
}
});
@@ -422,9 +426,9 @@
HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterDeviceBean> list) {
- if (list == null) {
- //浜戠娌℃湁缁戝畾閫嗗彉鍣�,娓呯┖鏈湴鍒楄〃;
- HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+ if (list == null || list.size() == 0) {
+// //浜戠娌℃湁缁戝畾閫嗗彉鍣�,浠ユ湰鍦颁负涓�;
+// HDLLinkLocalGateway.getInstance().getGatewayList().clear();
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
}
@@ -444,7 +448,7 @@
}
}
for (int i = 0; i < removeSidList.size(); i++) {
- //鑾峰彇鏈湴鐨勬绫虫尝
+ //鑾峰彇鏈湴鐨勯�嗗彉鍣�
removeInverter(removeSidList.get(i));
}
@@ -454,9 +458,9 @@
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException e) {
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(exception);
+ cloudCallBeak.onFailure(e);
}
}
});
@@ -467,18 +471,13 @@
HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterDeviceBean> list) {
- if (list == null) {
+ if (list == null || list.size() == 0) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
}
return;
}
- if (list.size() <= 0) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
- }
- return;
- }
+ //娓呮鏈湴缃戝叧鍒楄〃
HDLLinkLocalGateway.getInstance().getGatewayList().clear();
for (int i = 0; i < list.size(); i++) {
CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
@@ -491,6 +490,7 @@
gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());
gatewayBean.setLocalEncrypt(true);
gatewayBean.setMaster("true");
+ //娣诲姞缃戝叧
HDLLinkLocalGateway.getInstance().getGatewayList().add(gatewayBean);
}
if (cloudCallBeak != null) {
@@ -500,9 +500,9 @@
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException e) {
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(exception);
+ cloudCallBeak.onFailure(e);
}
}
});
--
Gitblit v1.8.0