From 70c1ba24af27ba64e1d9ad50eb722541212ed8b6 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期五, 30 六月 2023 17:26:54 +0800 Subject: [PATCH] 2023年06月30日17:26:51 --- app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 104 +++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 87 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 6ecf796..a5f0327 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -1,5 +1,7 @@ package com.hdl.photovoltaic.other; +import android.text.TextUtils; + import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; @@ -57,7 +59,7 @@ } /** - * 娣诲姞閫嗗彉鍣� + * 娣诲姞閫嗗彉鍣ㄥ埌浜戠涓� * * @param mac - * @param spk - @@ -66,7 +68,7 @@ * @param name - * @param cloudCallBeak */ - public void addInverterDevice(String mac, String spk, String sid, String oid, String name, CloudCallBeak<Boolean> cloudCallBeak) { + public void addInverterDeviceToCloud(String mac, String spk, String sid, String oid, String name, CloudCallBeak<Boolean> cloudCallBeak) { String requestUrl = HttpApi.POST_Device_Add; JsonObject json = new JsonObject(); @@ -96,12 +98,12 @@ } /** - * 鑾峰彇閫嗗彉鍣ㄥ垪琛� + * 鑾峰彇浜戠閫嗗彉鍣ㄥ垪琛� * * @param homeId 浣忓畢id * @param cloudCallBeak 鍥炶皟 */ - public void getInverterDeviceList(String homeId, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) { + public void getCloudInverterDeviceList(String homeId, CloudCallBeak<List<CloudInverterDeviceBean>> cloudCallBeak) { String requestUrl = HttpApi.POST_Device_List; JsonObject json = new JsonObject(); json.addProperty("homeId", homeId); @@ -110,20 +112,28 @@ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() { @Override public void onSuccess(HttpResponsePack httpResponsePack) { - if (httpResponsePack != null && httpResponsePack.getData() != null) { - Gson gson = new Gson(); - String json = gson.toJson(httpResponsePack.getData()); - CloudInverterDeviceBean loginUserRegionBean = new Gson().fromJson(json, CloudInverterDeviceBean.class); + 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) { if (cloudCallBeak != null) { - cloudCallBeak.onSuccess(loginUserRegionBean); + cloudCallBeak.onFailure(e); } } } @Override - public void onFailure(Exception exception) { + public void onFailure(Exception e) { if (cloudCallBeak != null) { - cloudCallBeak.onFailure(exception); + cloudCallBeak.onFailure(e); } } }); @@ -253,20 +263,32 @@ * @param cloudCallBeak 鍥炶皟update */ public void steGatewayParam(String mac, CloudCallBeak<Boolean> cloudCallBeak) { - String requestUrl = TopicApi.GATEWAY_SEND_REMOTE_EDIT; + String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT; JsonObject json = new JsonObject(); json.addProperty("homeId", UserConfigManage.getInstance().getHomeId()); json.addProperty("server_addr", AppConfigManage.getUserRegionUrl()); json.addProperty("local_secret", UserConfigManage.getInstance().getLocalSecret()); - TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() { + //瑙e瘑璐熻浇鏁版嵁(鍥犱负鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槑鏂囷紝鍥犱负閭f椂缃戝叧杩樻病鏈夊瘑閽�) + TcpClient.getInstance().sendDataToLinkGateway(mac, false, 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 (cloudCallBeak != null) { + cloudCallBeak.onSuccess(true); + } } @Override public void onError(HDLLinkException e) { - + if (cloudCallBeak != null) { + cloudCallBeak.onFailure(e); + } } }); } @@ -278,18 +300,66 @@ * @param cloudCallBeak 鍥炶皟update */ public void editGatewayParam(String mac, CloudCallBeak<Boolean> cloudCallBeak) { - String requestUrl = TopicApi.GATEWAY_SEND_EDIT; + String requestUrl = TopicApi.SET_GATEWAY_EDIT; JsonObject json = new JsonObject(); json.addProperty("master", "true"); - TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() { + TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() { @Override public void onSuccess(String msg) { - + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(true); + } } @Override public void onError(HDLLinkException e) { + if (cloudCallBeak != null) { + cloudCallBeak.onFailure(e); + } + } + }); + } + + /** + * 鑾峰彇缃戝叧oid鍒楄〃 + * + * @param mac 缃戝叧mac + * @param cloudCallBeak 鍥炶皟 + */ + public void getGatewayOidList(String mac, CloudCallBeak<List<OidBean>> cloudCallBeak) { + 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<>()); + } + } + + } catch (Exception e) { + if (cloudCallBeak != null) { + cloudCallBeak.onFailure(e); + } + } + } + + @Override + public void onError(HDLLinkException e) { + if (cloudCallBeak != null) { + cloudCallBeak.onFailure(e); + } } }); -- Gitblit v1.8.0