From 44180904ae4711ba68412b21953f66f32ef8d266 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 12 十月 2023 15:35:06 +0800
Subject: [PATCH] 2023年10月12日15:35:01
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 8
app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceTimeBean.java | 152 ++++++++++++++++++++++++++++++
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 43 +++++--
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 38 ++++---
5 files changed, 209 insertions(+), 34 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
index eab83ff..0a9866e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -73,7 +73,7 @@
String requestUrl = HDLCloudUserApi.getRequestUrl(api);
Gson gson = new Gson();
- System.out.println("鍙戦��->" + requestUrl + "\r\n" + body);
+ System.out.println("http->鍙戦��->" + requestUrl + "\r\n" + body);
return HxHttp.builder()
.url(requestUrl)
.raw(body)
@@ -84,8 +84,8 @@
public void onResponse(String str) {
if (callBack != null) {
callBack.onSuccess(str);
-// System.out.println("鍥炲->" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString());
- System.out.println("鍥炲->" + requestUrl + "\r\n" + str);
+// System.out.println("http->鍥炲->" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString());
+ System.out.println("http->鍥炲->" + requestUrl + "\r\n" + str);
}
}
@@ -94,7 +94,7 @@
HDLExceptionSubmitUtils.submit(requestUrl, body, e);
if (callBack != null) {
callBack.onFailure(e);
- System.out.println("鍥炲->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}");
+ System.out.println("http->鍥炲->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}");
}
}
});
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 aa79f49..85993cc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -18,6 +18,7 @@
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.DeviceTimeBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
@@ -69,8 +70,7 @@
if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
continue;
}
- if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue)
- && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
newList.add(gatewayBean);
}
}
@@ -353,13 +353,22 @@
* @param mac 璁惧mac
* @param linkCallBack 鍥炶皟update
*/
- public void getGatewayTime(String mac, LinkCallBack<Boolean> linkCallBack) {
+ public void getGatewayTime(String mac, LinkCallBack<DeviceTimeBean> linkCallBack) {
String requestUrl = TopicApi.GET_GATEWAY_TIME;
TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
@Override
- public void onSuccess(String msg) {
+ public void onSuccess(String json) {
+
+ if (TextUtils.isEmpty(json)) {
+ if (linkCallBack != null) {
+ linkCallBack.onSuccess(new DeviceTimeBean());
+ }
+ return;
+ }
+ Gson gson = new Gson();
+ DeviceTimeBean deviceTimeBean = gson.fromJson(json, DeviceTimeBean.class);
if (linkCallBack != null) {
- linkCallBack.onSuccess(true);
+ linkCallBack.onSuccess(deviceTimeBean);
}
}
@@ -377,17 +386,16 @@
* 缃戝叧鏃堕棿淇敼
*
* @param mac 璁惧mac
+ * @param date 鏃ユ湡
+ * @param time 鏃堕棿
* @param linkCallBack 鍥炶皟update
*/
- public void editGatewayTime(String mac, JsonObject jsonObject, LinkCallBack<Boolean> linkCallBack) {
+ public void editGatewayTime(String mac, String date, String time, LinkCallBack<Boolean> linkCallBack) {
String requestUrl = TopicApi.SET_GATEWAY_TIME_EDIT;
-// JsonObject json = new JsonObject();
-// json.addProperty("master", "true");
-// "objects": {
-// "date": "2020-08-15",
-// "time": "17:25:20"
-// }
- TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, jsonObject, "", new HDLLinkCallBack() {
+ JsonObject json = new JsonObject();
+ json.addProperty("date", date);// "2020-08-15"
+ json.addProperty("time", time);//"17:25:20"
+ TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
if (linkCallBack != null) {
@@ -705,7 +713,7 @@
}
/**
- * 鍒犻櫎鏈湴閫嗗彉鍣�
+ * 鍒犻櫎鏈湴缂撳瓨閫嗗彉鍣�
*
* @param sid 璁惧sid
*/
@@ -724,7 +732,7 @@
public void clearInverterHomeId(String mac, LinkCallBack<Boolean> callBeak) {
String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
JsonObject json = new JsonObject();
- json.addProperty("homeId","");
+ json.addProperty("homeId", "");
json.addProperty("server_addr", "");
TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() {
@Override
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
index fd72ca5..4ac7e43 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -524,7 +524,7 @@
MqttRecvClient.getInstance().removeAllTopic();
}
//瑕佹竻绌轰箣鍓峵cp杩炴帴缂撳瓨
- // TODO: 10/10/23
+ //TODO: 10/10/23
//鍒犻櫎鏃х殑浣忓畢鏂囦欢澶�
HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentHomeRootPath());
//閲嶆柊璁剧疆浣忓畢id
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index def2843..9be1182 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -14,6 +14,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
+import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
@@ -253,13 +254,13 @@
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
});
}
/**
- * 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠
+ * 閫嗗彉鍣ㄣ�愪笂浼犳暟鎹�戝埌浜戠
*
* @param data uni鏁版嵁
* @param callback uni鍥炶皟
@@ -277,7 +278,19 @@
*/
private void uniEditInverterTime(Object data, DCUniMPJSCallback callback) {
String mac = getKeyValue("mac", getKeyValue("data", data));
- HdlDeviceLogic.getInstance().editGatewayTime(mac, new JsonObject(), null);
+ String date = getKeyValue("date", getKeyValue("data", data));
+ String time = getKeyValue("time", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().editGatewayTime(mac, date, time, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniCallbackData(true, callback);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+ }
+ });
}
/**
@@ -288,15 +301,17 @@
*/
private void uniGetInverterTime(Object data, DCUniMPJSCallback callback) {
String mac = getKeyValue("mac", getKeyValue("data", data));
- HdlDeviceLogic.getInstance().getGatewayTime(mac, new LinkCallBack<Boolean>() {
+ HdlDeviceLogic.getInstance().getGatewayTime(mac, new LinkCallBack<DeviceTimeBean>() {
@Override
- public void onSuccess(Boolean obj) {
-
+ public void onSuccess(DeviceTimeBean deviceTimeBean) {
+ if (callback != null) {
+ uniCallbackData(deviceTimeBean, callback);
+ }
}
@Override
public void onError(HDLLinkException e) {
-
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
}
@@ -319,7 +334,7 @@
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -2, e.getMsg(), callback);
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
}
@@ -356,21 +371,21 @@
@Override
public void onFailure(HDLException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
});
}
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
});
}
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
});
}
@@ -391,7 +406,7 @@
@Override
public void onFailure(HDLException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
});
}
@@ -412,7 +427,7 @@
@Override
public void onError(HDLLinkException e) {
//鍙戦�佸け璐�
- uniCallbackData(null, e.getCode(), "", callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
});
@@ -440,7 +455,7 @@
@Override
public void onFailure(HDLException e) {
if (callback != null) {
- uniCallbackData(null, -2, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceTimeBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceTimeBean.java
new file mode 100644
index 0000000..7c861a6
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceTimeBean.java
@@ -0,0 +1,152 @@
+package com.hdl.photovoltaic.ui.bean;
+
+import java.io.Serializable;
+
+public class DeviceTimeBean implements Serializable {
+
+ private String date;
+ private String lunar;
+ private String time;
+ private String week;
+ private String sunrise;//鏃ュ嚭鏃堕棿
+ private String sunset;//鏃ヨ惤鏃堕棿
+ private String noon;//姝ｅ崍鏃堕棿
+ private String broadcast_time;//骞挎挱鏃堕棿闂撮殧
+ private String localtimestamp;//鏈湴鏃堕棿鏃堕棿鎴�
+ private String zone;//鏃跺尯
+ private DstBean dst;
+
+ public String getDate() {
+ return date;
+ }
+
+ public void setDate(String date) {
+ this.date = date;
+ }
+
+ public String getLunar() {
+ return lunar == null ? "" : lunar;
+ }
+
+ public void setLunar(String lunar) {
+ this.lunar = lunar;
+ }
+
+ public String getTime() {
+ return time == null ? "" : time;
+ }
+
+ public void setTime(String time) {
+ this.time = time;
+ }
+
+ public String getWeek() {
+ return week == null ? "" : week;
+ }
+
+ public void setWeek(String week) {
+ this.week = week;
+ }
+
+ public String getSunrise() {
+ return sunrise == null ? "" : sunrise;
+ }
+
+ public void setSunrise(String sunrise) {
+ this.sunrise = sunrise;
+ }
+
+ public String getSunset() {
+ return sunset == null ? "" : sunset;
+ }
+
+ public void setSunset(String sunset) {
+ this.sunset = sunset;
+ }
+
+ public String getNoon() {
+ return noon == null ? "" : noon;
+ }
+
+ public void setNoon(String noon) {
+ this.noon = noon;
+ }
+
+ public String getBroadcast_time() {
+ return broadcast_time == null ? "" : broadcast_time;
+ }
+
+ public void setBroadcast_time(String broadcast_time) {
+ this.broadcast_time = broadcast_time;
+ }
+
+ public String getLocaltimestamp() {
+ return localtimestamp == null ? "" : localtimestamp;
+ }
+
+ public void setLocaltimestamp(String localtimestamp) {
+ this.localtimestamp = localtimestamp;
+ }
+
+ public String getZone() {
+ return zone == null ? "" : zone;
+ }
+
+ public void setZone(String zone) {
+ this.zone = zone;
+ }
+
+ public DstBean getDst() {
+ return dst;
+ }
+
+ public void setDst(DstBean dst) {
+ this.dst = dst;
+ }
+
+ public static class DstBean {
+ /**
+ * enable : false
+ * status : false
+ * start : 0,0,0,0
+ * stop : 0,0,0,0
+ */
+
+ private String enable;
+ private String status;
+ private String start;//浜旀湀锛岀涓夊懆锛屽懆鏃ワ紝涓ょ偣
+ private String stop;//鍗佹湀锛岀鍥涘懆锛屽懆鏃ワ紝涓ょ偣
+
+ public String getEnable() {
+ return enable == null ? "" : enable;
+ }
+
+ public void setEnable(String enable) {
+ this.enable = enable;
+ }
+
+ public String getStatus() {
+ return status == null ? "" : status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getStart() {
+ return start == null ? "" : start;
+ }
+
+ public void setStart(String start) {
+ this.start = start;
+ }
+
+ public String getStop() {
+ return stop == null ? "" : stop;
+ }
+
+ public void setStop(String stop) {
+ this.stop = stop;
+ }
+ }
+}
--
Gitblit v1.8.0