From ba84a556dc93fcf75e6ec76f999344d3f96ad788 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期五, 02 二月 2024 18:05:24 +0800 Subject: [PATCH] 2024年02月02日18:04:36 --- app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 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 6175ea4..3ac4c25 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -117,26 +117,26 @@ public void uploadDataToCloud(String homeId, String mac, CloudCallBeak<Boolean> callBeak) { getInverterOidList(mac, new LinkCallBack<List<OidBean>>() { @Override - public void onSuccess(List<OidBean> obj) { - if (obj == null) { + public void onSuccess(List<OidBean> oidBeanList) { + if (oidBeanList == null) { return; } - fullUpdateOid(homeId, obj, new CloudCallBeak<Boolean>() { + fullUpdateOid(homeId, oidBeanList, new CloudCallBeak<Boolean>() { @Override public void onSuccess(Boolean obj) { - HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�-->" + homeId + "--->" + mac, true); + HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�--->浣忓畢id:" + homeId + "--->mac:" + mac, true); } @Override public void onFailure(HDLException e) { - HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�-->" + homeId + "--->" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true); + HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�--->浣忓畢id:" + homeId + "--->mac:" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true); } }); } @Override public void onError(HDLLinkException e) { - HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触-->" + homeId + "--->" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true); + HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触--->浣忓畢id:" + homeId + "--->mac:" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true); } }); @@ -332,7 +332,6 @@ cloudCallBeak.onSuccess(true); } - HdlLogLogic.print("鍏ㄩ噺鏇存柊oid鍒颁簯绔垚鍔�--->", true); } @@ -341,7 +340,6 @@ if (cloudCallBeak != null) { cloudCallBeak.onFailure(e); } - HdlLogLogic.print("鍏ㄩ噺鏇存柊oid鍒颁簯绔け璐�--->" + e.getMsg() + "(" + e.getCode() + ")", true); } }); @@ -444,7 +442,7 @@ * 缃戝叧鏃堕棿璇诲彇 * * @param mac 璁惧mac - * @param linkCallBack 鍥炶皟update + * @param linkCallBack 鍥炶皟updatetime */ public void getGatewayTime(String mac, LinkCallBack<DeviceTimeBean> linkCallBack) { String requestUrl = TopicApi.GET_GATEWAY_TIME; @@ -484,13 +482,22 @@ * @param mac 璁惧mac * @param date 鏃ユ湡 * @param time 鏃堕棿 + * @param timezone 鏃跺尯 * @param linkCallBack 鍥炶皟update */ - public void editGatewayTime(String mac, String date, String time, LinkCallBack<Boolean> linkCallBack) { + public void editGatewayTime(String mac, String date, String time, String timezone, LinkCallBack<Boolean> linkCallBack) { String requestUrl = TopicApi.SET_GATEWAY_TIME_EDIT; JsonObject json = new JsonObject(); - json.addProperty("date", date);// "2020-08-15" - json.addProperty("time", time);//"17:25:20" + if (!TextUtils.isEmpty(date)) { + json.addProperty("date", date);// "2020-08-15" + } + if (!TextUtils.isEmpty(time)) { + json.addProperty("time", time);//"17:25:20" + } + if (!TextUtils.isEmpty(timezone)) { + json.addProperty("timezone", timezone);//鏃跺尯(璇泙https://hdl-gz.yuque.com/wnkbmh/cdrglh/yckkyp#qWOPS) + } + TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() { @Override public void onSuccess(String msg) { @@ -763,7 +770,7 @@ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId)); } } - HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")"); + HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触--->msg--->" + e.getMsg() + "(" + e.getCode() + ")"); } }); } @@ -843,6 +850,7 @@ JsonObject json = new JsonObject(); json.addProperty("homeId", ""); json.addProperty("server_addr", ""); + json.addProperty("local_secret", ""); TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() { @Override public void onSuccess(String msg) { -- Gitblit v1.8.0