From 32b5f366ceaad4aa9a33eccf0b109eef24175495 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 10 十月 2023 14:55:01 +0800
Subject: [PATCH] 2023年10月10日14:54:56
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 376 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 322 insertions(+), 54 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 40df325..037b4bf 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -7,8 +7,14 @@
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.hdlhttp.HxHttp;
+import com.hdl.linkpm.sdk.core.api.HDLCloudHomeApi;
+import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.linkpm.sdk.core.response.HDLResponse;
+import com.hdl.linkpm.sdk.device.bean.FunctionInfoBean;
+import com.hdl.linkpm.sdk.utils.HDLExceptionSubmitUtils;
import com.hdl.photovoltaic.bean.HttpResponsePack;
+import com.hdl.photovoltaic.bean.LocalResponse;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
@@ -20,6 +26,7 @@
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.DeviceRemoteInfo;
import com.hdl.photovoltaic.ui.bean.InverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
@@ -27,18 +34,24 @@
import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
+import com.hdl.sdk.link.core.bean.request.BaseLocalRequest;
+import com.hdl.sdk.link.core.bean.response.BaseLocalResponse;
import com.hdl.sdk.link.core.callback.GatewayCallBack;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
+import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
+import com.hdl.sdk.link.gateway.type.GatewayMasterType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
import io.reactivex.rxjava3.disposables.Disposable;
+
/**
- * 璁惧閫昏緫鐨勭晫闈�
+ * 璁惧閫昏緫
*/
public class HdlDeviceLogic {
private static volatile HdlDeviceLogic sHdlDeviceLogic;
@@ -61,6 +74,28 @@
}
/**
+ * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�
+ */
+ public List<GatewayBean> getCurrentHomeGatewayList() {
+ 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.getDevice_mac())) {
+ continue;
+ }
+ if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue)
+ && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ newList.add(gatewayBean);
+ }
+ }
+ }
+ return newList;
+ }
+
+
+ /**
* 娣诲姞閫嗗彉鍣ㄥ埌浜戠涓�
*
* @param mac -
@@ -68,7 +103,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) {
@@ -87,6 +122,31 @@
public void onSuccess(String str) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
+ //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔�
+ getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
+ @Override
+ public void onSuccess(List<OidBean> obj) {
+ if (obj == null) {
+ return;
+ }
+ fullUpdateOid(obj, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+
+ }
+ });
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+
+ }
+ });
}
}
@@ -214,7 +274,7 @@
* @param cloudCallBeak 鍥炶皟update
*/
public void fullUpdateOid(List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
- String requestUrl = HttpApi.POST_Device_ChildDevices_List;
+ String requestUrl = HttpApi.POST_Device_Oid;
JsonObject json = new JsonObject();
json.addProperty("operationSource", "PROGRAM_ENERGY");//
json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
@@ -224,7 +284,7 @@
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("protocolType", oidBean.getProtocolType());
jsonObject.addProperty("deviceType", oidBean.getDeviceType());
- jsonObject.addProperty("mac", oidBean.getMac());
+ jsonObject.addProperty("mac", oidBean.getDevice_mac());
jsonObject.addProperty("oid", oidBean.getOid());
jsonObject.addProperty("device_name", oidBean.getDevice_name());
jsonObject.addProperty("device_model", oidBean.getDevice_model());
@@ -263,7 +323,7 @@
* @param mac 璁惧mac
* @param linkCallBack 鍥炶皟update
*/
- public void steGatewayParam(String mac, LinkCallBack<Boolean> linkCallBack) {
+ 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());
@@ -295,16 +355,14 @@
}
/**
- * 缂栬緫缃戝叧鍙傛暟
+ * 缃戝叧鏃堕棿璇诲彇
*
* @param mac 璁惧mac
* @param linkCallBack 鍥炶皟update
*/
- 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() {
+ public void getGatewayTime(String mac, LinkCallBack<Boolean> linkCallBack) {
+ String requestUrl = TopicApi.GET_GATEWAY_TIME;
+ TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
if (linkCallBack != null) {
@@ -322,6 +380,65 @@
}
+ /**
+ * 缃戝叧鏃堕棿淇敼
+ *
+ * @param mac 璁惧mac
+ * @param linkCallBack 鍥炶皟update
+ */
+ public void editGatewayTime(String mac, JsonObject jsonObject, 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() {
+ @Override
+ public void onSuccess(String msg) {
+ if (linkCallBack != null) {
+ linkCallBack.onSuccess(true);
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ if (linkCallBack != null) {
+ linkCallBack.onError(e);
+ }
+ }
+ });
+
+ }
+
+ /**
+ * 缂栬緫缃戝叧鍙傛暟
+ *
+ * @param mac 璁惧mac
+ * @param linkCallBack 鍥炶皟update
+ */
+ public void editGatewayParam(String mac, LinkCallBack<Boolean> linkCallBack) {
+ String requestUrl = TopicApi.SET_GATEWAY_EDIT;
+ JsonObject json = new JsonObject();
+ json.addProperty("master", GatewayMasterType.MasterTrue);
+ TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ if (linkCallBack != null) {
+ linkCallBack.onSuccess(true);
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ if (linkCallBack != null) {
+ linkCallBack.onError(e);
+ }
+ }
+ });
+
+ }
/**
* 鑾峰彇缃戝叧璇︽儏淇℃伅
@@ -375,11 +492,17 @@
return;
}
Gson gson = new Gson();
- Type typeOfT = new TypeToken<List<OidBean>>() {
+ Type typeOfT = new TypeToken<BaseLocalResponse<List<OidBean>>>() {
}.getType();
- List<OidBean> list = gson.fromJson(json, typeOfT);
- if (linkCallBack != null) {
- linkCallBack.onSuccess(list);
+ BaseLocalResponse<List<OidBean>> baseLocalResponse = gson.fromJson(json, typeOfT);
+
+ if (linkCallBack == null) {
+ return;
+ }
+ if (baseLocalResponse == null || baseLocalResponse.getObjects() == null) {
+ linkCallBack.onSuccess(new ArrayList<>());
+ } else {
+ linkCallBack.onSuccess(baseLocalResponse.getObjects());
}
}
@@ -394,15 +517,16 @@
}
/**
- * 鑾峰彇鏈湴璁惧鍒楄〃
+ * 鑾峰彇閫嗗彉鍣ㄥ垪琛�
* 娉ㄦ剰:鏈夊缃戜互浜戠璁惧涓哄噯,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戜互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
*
- * @param cloudCallBeak -
+ * @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
*/
- public void getLocalGatewayList(CloudCallBeak<Boolean> cloudCallBeak) {
+ public void getCurrentHomeLocalAndCloudGatewayList(CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
+ //灞�鍩熺綉鎯呭喌
HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterDeviceBean> list) {
@@ -410,31 +534,75 @@
// //浜戠娌℃湁缁戝畾閫嗗彉鍣�,浠ユ湰鍦颁负涓�;
// HDLLinkLocalGateway.getInstance().getGatewayList().clear();
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
}
return;
}
- //鏀堕泦鍒犻櫎閫嗗彉鍣╯id
- List<String> removeSidList = new ArrayList<>();
+ //璁板綍鏉℃暟
+ AtomicInteger atomicInteger = new AtomicInteger(0);
for (int i = 0; i < list.size(); i++) {
CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
- for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
- GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
- if (!cloudInverterDeviceBean.getSid().equals(gatewayBean.getSid())) {
- //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
- removeSidList.add(gatewayBean.getSid());
+ getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
+ @Override
+ public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ refreshGatewayCacheData(true, cloudInverterDeviceBean, deviceRemoteInfo);
+ if (atomicInteger.get() == list.size()) {
+ //鏀堕泦鍒犻櫎閫嗗彉鍣╯id
+ List<String> removeSidList = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+ for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
+ if (!cloudInverterDeviceBean.getSid().equals(gatewayBean.getSid())) {
+ //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
+ removeSidList.add(gatewayBean.getSid());
+ }
+
+ }
+ }
+ for (int i = 0; i < removeSidList.size(); i++) {
+ //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
+ removeInverter(removeSidList.get(i));
+ }
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ }
+ }
}
- }
- }
- for (int i = 0; i < removeSidList.size(); i++) {
- //鑾峰彇鏈湴鐨勬绫虫尝
- removeInverter(removeSidList.get(i));
+ @Override
+ public void onFailure(HDLException e) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ //鏈夊彲鑳芥渶鍚庝竴鏉℃槸澶辫触鐨�
+ if (atomicInteger.get() == list.size()) {
+ //鏀堕泦鍒犻櫎閫嗗彉鍣╯id
+ List<String> removeSidList = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+ for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
+ if (!cloudInverterDeviceBean.getSid().equals(gatewayBean.getSid())) {
+ //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
+ removeSidList.add(gatewayBean.getSid());
+ }
+
+ }
+ }
+ for (int i = 0; i < removeSidList.size(); i++) {
+ //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
+ removeInverter(removeSidList.get(i));
+ }
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ }
+ }
+ HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
+ }
+ });
}
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
- }
+
}
@Override
@@ -448,34 +616,47 @@
@Override
public void onError(HDLLinkException e) {
+ //澶栫綉鎯呭喌
HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterDeviceBean> list) {
+ //浜戠娌℃湁,娓呯┖鏈湴閫嗗彉鍣ㄥ垪琛�
+ HDLLinkLocalGateway.getInstance().getGatewayList().clear();
if (list == null || list.size() == 0) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
}
return;
}
- //娓呮鏈湴缃戝叧鍒楄〃
- HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+ //璁板綍鏉℃暟
+ AtomicInteger atomicInteger = new AtomicInteger(0);
for (int i = 0; i < list.size(); i++) {
CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
- GatewayBean gatewayBean = new GatewayBean();
- gatewayBean.setOid(cloudInverterDeviceBean.getOid());
- gatewayBean.setSid(cloudInverterDeviceBean.getSid());
- gatewayBean.setGatewayId(cloudInverterDeviceBean.getGatewayId());
- gatewayBean.setOnline(cloudInverterDeviceBean.isOnline());
- gatewayBean.setDevice_name(cloudInverterDeviceBean.getGatewayName());
- gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());
- gatewayBean.setLocalEncrypt(true);
- gatewayBean.setMaster("true");
- //娣诲姞缃戝叧
- HDLLinkLocalGateway.getInstance().getGatewayList().add(gatewayBean);
+ getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
+ @Override
+ public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo);
+ if (atomicInteger.get() == list.size()) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ }
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ if (atomicInteger.get() == list.size()) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ }
+ }
+ HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
+ }
+ });
}
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
- }
+
}
@@ -491,12 +672,51 @@
}
/**
+ * 鑾峰彇璁惧杩滅▼閫氳淇℃伅
+ *
+ * @param homeId 浣忓畢Id
+ * @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;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ json.addProperty("spk", spk);
+ json.addProperty("mac", mac);
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(null);
+ }
+ }
+ Type type = new TypeToken<DeviceRemoteInfo>() {
+ }.getType();
+ DeviceRemoteInfo deviceRemoteInfo = new Gson().fromJson(jsonStr, type);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(deviceRemoteInfo);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+ }
+
+ /**
* 鍒犻櫎鏈湴閫嗗彉鍣�
*
* @param sid 璁惧sid
*/
private void removeInverter(String sid) {
- //鑾峰彇鏈湴鐨勬绫虫尝
GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(sid);
if (gatewayBean != null) {
HDLLinkLocalGateway.getInstance().getGatewayList().remove(gatewayBean);
@@ -504,7 +724,7 @@
}
/**
- * 鎼滅储缃戝叧鍒楄〃
+ * 鎼滅储閫嗗彉鍣ㄥ垪琛�
*
* @param gatewayCallBack -
*/
@@ -515,13 +735,61 @@
}
/**
+ * 鍒锋柊閫嗗彉鍣ㄧ紦瀛樹俊鎭�(鍖呮嫭璁剧疆mqtt绉橀挜锛�
+ * 娉�:
+ * 1:鏈湴瀛樺湪鏇存柊淇℃伅鍗冲彲;
+ * 2:浜戠鏈夋湰鍦颁笉瀛樺湪,鍒欒櫄鎷熶竴涓�嗗彉鍣ㄥ璞℃坊鍔犲湪鏈湴;
+ *
+ * @param deviceRemoteInfo 璁惧杩滅▼閫氳淇℃伅
+ * @param cloudInverterDeviceBean 閫嗗彉鍣�
+ */
+ private static void refreshGatewayCacheData(boolean isLocal, CloudInverterDeviceBean cloudInverterDeviceBean, DeviceRemoteInfo deviceRemoteInfo) {
+ //鏈湴鏌ユ壘閫嗗彉鍣�
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(cloudInverterDeviceBean.getOsn());
+ if (gatewayBean == null) {
+ //涓嶅瓨鍦紝铏氭嫙涓�涓�嗗彉鍣ㄥ璞�;
+ gatewayBean = new GatewayBean();
+ HDLLinkLocalGateway.getInstance().getGatewayList().add(gatewayBean);//娣诲姞閫嗗彉鍣ㄨ澶�
+ }
+ //鏇存柊灞炴��
+ if (deviceRemoteInfo != null) {
+ gatewayBean.setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜
+ gatewayBean.setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
+ //鐢ㄤ箣鍓嶇殑搴�,搴曞眰mqtt璁㈤槄锛屽姞瑙ｅ瘑浼氱敤鍒拌鍙傛暟;
+ HDLLinkConfig.getInstance().setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜搴�
+ HDLLinkConfig.getInstance().setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
+
+ }
+ gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());//浣忓畢id
+ gatewayBean.setDeviceStatus(cloudInverterDeviceBean.getDeviceStatus());//璁剧疆缃戝叧鐘舵��
+ gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId());//璁剧疆link璁惧id
+ gatewayBean.setDevice_mac(cloudInverterDeviceBean.getOsn());//璁剧疆mac
+ gatewayBean.setOid(cloudInverterDeviceBean.getOid());//璁惧oid
+ gatewayBean.setSid(cloudInverterDeviceBean.getSid());//璁惧sid
+ gatewayBean.setDevice_name(cloudInverterDeviceBean.getName());//璁惧鍚嶇О
+ gatewayBean.setGatewayType(cloudInverterDeviceBean.getSpk());//璁剧疆spk
+ gatewayBean.setLocalEncrypt(true);
+ gatewayBean.setMaster(GatewayMasterType.MasterTrue);
+ gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵��
+ gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙�
+ gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О
+ gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�
+ gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
+ gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
+
+ }
+
+
+ /**
* 鑾峰彇缃戝叧spk鍒楄〃
*
* @return -
*/
private List<String> getGatewaySpk() {
List<String> spks = new ArrayList<>();
- spks.add("energy.hdl_inverter");
+ spks.add(DEVICE_SPK);
return spks;
}
+
+ public final String DEVICE_SPK = "energy.hdl_inverter";
}
--
Gitblit v1.8.0