From a8e0bddc9903d854808e9526600128e95560faa3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 30 十月 2023 18:21:25 +0800
Subject: [PATCH] 2023年10月30日18:21:12
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 66 ++++++++++++++++++++++++--------
1 files changed, 49 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 0986533..840aa9d 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,13 +70,32 @@
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);
}
}
}
return newList;
+ }
+
+ /**
+ * 鑾峰彇褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣ㄥ垪琛�
+ */
+ public GatewayBean getCurrentHomeMainGateway() {
+ 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.getDevice_mac())) {
+ continue;
+ }
+ if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ //鎵惧埌杩斿洖
+ return gatewayBean;
+ }
+ }
+ }
+ return null;
}
/**
@@ -353,13 +373,25 @@
* @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();
+ Type typeOfT = new TypeToken<BaseLocalResponse<DeviceTimeBean>>() {
+ }.getType();
+ BaseLocalResponse<DeviceTimeBean> baseLocalResponse = gson.fromJson(json, typeOfT);
if (linkCallBack != null) {
- linkCallBack.onSuccess(true);
+ linkCallBack.onSuccess(baseLocalResponse.getObjects());
}
}
@@ -377,17 +409,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) {
@@ -511,7 +542,7 @@
/**
* 鑾峰彇閫嗗彉鍣ㄥ垪琛�
- * 娉ㄦ剰:鏈夊缃戜互浜戠璁惧涓哄噯,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戜互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
+ * 娉ㄦ剰:鏈夊缃戜互浜戠璁惧涓哄噯;鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戜互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
*
* @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
*/
@@ -671,7 +702,6 @@
* @param spk spk
* @param mac 璁惧mac
* @param cloudCallBeak 鍥炶皟
- * @return -
*/
public void getDeviceRemoteInfo(String homeId, String spk, String mac, CloudCallBeak<DeviceRemoteInfo> cloudCallBeak) {
String requestUrl = HttpApi.POST_Device_RemoteInfo;
@@ -705,7 +735,7 @@
}
/**
- * 鍒犻櫎鏈湴閫嗗彉鍣�
+ * 鍒犻櫎鏈湴缂撳瓨閫嗗彉鍣�
*
* @param sid 璁惧sid
*/
@@ -724,7 +754,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
@@ -760,6 +790,7 @@
//缃戝叧鎼滅储
HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack);
}
+
/**
* 鍒锋柊閫嗗彉鍣ㄧ紦瀛樹俊鎭�(鍖呮嫭璁剧疆mqtt绉橀挜锛�
@@ -804,6 +835,7 @@
gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
+ gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
}
--
Gitblit v1.8.0