From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 750 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 558 insertions(+), 192 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 4be1d77..ff46904 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -3,12 +3,13 @@
import android.os.SystemClock;
import android.text.TextUtils;
-import com.facebook.imagepipeline.image.OriginalEncodedImageInfo;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.photovoltaic.bean.InverterBean;
+import com.hdl.photovoltaic.bean.LocalResponse;
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
@@ -20,34 +21,25 @@
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.DeviceBean;
+import com.hdl.photovoltaic.ui.bean.DeviceInfoBean;
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
-import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
-import com.hdl.photovoltaic.ui.bean.MessageBean;
+import com.hdl.photovoltaic.ui.bean.NotRunBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
-import com.hdl.photovoltaic.ui.bean.StatusOverviewBean;
-import com.hdl.sdk.link.HDLLinkLocalSdk;
-import com.hdl.sdk.link.common.config.TopicConstant;
-import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
-import com.hdl.sdk.link.common.utils.IdUtils;
-import com.hdl.sdk.link.core.bean.LinkRequest;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
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.core.connect.HDLConnectHelper;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import com.hdl.sdk.link.gateway.type.GatewayMasterType;
import java.lang.reflect.Type;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
@@ -74,14 +66,8 @@
return sHdlDeviceLogic;
}
- public static final String kWp = "kWp";
- public static final String kWh = "kW.h";
- public static final String kW = "kW";
- public static final String noValue = "0.00";
-
- private List<DeviceBean> mListDevice = new ArrayList<>();
-
+ private List<CloudInverterDeviceBean> mListDevice = new ArrayList<>();
public void clearDeviceList() {
@@ -93,7 +79,7 @@
}
}
- public List<DeviceBean> getDeviceList() {
+ public List<CloudInverterDeviceBean> getDeviceList() {
if (mListDevice == null) {
return new ArrayList<>();
}
@@ -156,7 +142,7 @@
* @param homeId 鐢电珯id
* @param mac 閫嗗彉鍣╩ac
*/
- public void removeLocalCacheMemoryGateway(String homeId, String mac) {
+ public void removeLocalCacheMemoryGatewayToMac(String homeId, String mac) {
if (TextUtils.isEmpty(mac)) {
return;
}
@@ -178,13 +164,62 @@
}
/**
+ * 绉婚櫎缂撳瓨鍒楄〃閲岄潰閫嗗彉鍣�
+ *
+ * @param homeId 鐢电珯id
+ * @param deviceId 閫嗗彉鍣╠eviceId
+ */
+ public void removeLocalCacheMemoryGatewayToDeviceId(String homeId, String deviceId) {
+ if (TextUtils.isEmpty(deviceId)) {
+ return;
+ }
+ List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
+ if (list == null || list.size() == 0) {
+ return;
+ }
+ int index = -1;
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean.getDeviceId().equals(deviceId)) {
+ index = i;
+ break;
+ }
+ }
+ if (index > 0) {
+ list.remove(index);
+ }
+ }
+
+ /**
+ * 娣诲姞銆愯澶囧垪琛ㄣ�戝埌鏈湴缂撳瓨
+ *
+ * @param list -璁惧鍒楄〃
+ */
+ public void setListDevice(List<CloudInverterDeviceBean> list) {
+ try {
+ if (list == null || list.size() == 0) {
+ return;
+ }
+ if (this.mListDevice.size() == 0) {
+ this.mListDevice.addAll(list);
+ return;
+ }
+ for (int i = 0; i < list.size(); i++) {
+ this.setSingleDevice(list.get(i));
+ }
+ } catch (Exception ignored) {
+ }
+ }
+
+
+ /**
* 鑾峰彇璁惧鍒楄〃(瀹夎鍟�)
*
* @param searchTxt 鎼滅储鍐呭
* @param pageNo 椤电爜
* @param pageSize 椤垫暟
*/
- public void getPowerStationDeviceList(String searchTxt, long pageNo, long pageSize, CloudCallBeak<PageNumberObject<DeviceBean>> cloudCallBeak) {
+ public void getPowerStationDeviceList(String searchTxt, long pageNo, long pageSize, CloudCallBeak<PageNumberObject<CloudInverterDeviceBean>> cloudCallBeak) {
String requestUrl = HttpApi.POST_deviceList;
JsonObject json = new JsonObject();
if (!TextUtils.isEmpty(searchTxt)) {
@@ -202,9 +237,9 @@
}
}
Gson gson = new Gson();
- Type type = new TypeToken<PageNumberObject<DeviceBean>>() {
+ Type type = new TypeToken<PageNumberObject<CloudInverterDeviceBean>>() {
}.getType();
- PageNumberObject<DeviceBean> pageNumberObject = gson.fromJson(jsonStr, type);
+ PageNumberObject<CloudInverterDeviceBean> pageNumberObject = gson.fromJson(jsonStr, type);
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(pageNumberObject);
}
@@ -219,34 +254,12 @@
});
}
-
- /**
- * 娣诲姞銆愯澶囧垪琛ㄣ�戝埌鏈湴缂撳瓨
- *
- * @param list -璁惧鍒楄〃
- */
- public void setListDevice(List<DeviceBean> list) {
- try {
- if (list == null || list.size() == 0) {
- return;
- }
- if (this.mListDevice.size() == 0) {
- this.mListDevice.addAll(list);
- return;
- }
- for (int i = 0; i < list.size(); i++) {
- this.setSingleDevice(list.get(i));
- }
- } catch (Exception ignored) {
- }
- }
-
/**
* 娣诲姞璁惧鍒板垪琛ㄩ噷闈�
*
* @param deviceBean -璁惧瀵硅薄
*/
- public void setSingleDevice(DeviceBean deviceBean) {
+ public void setSingleDevice(CloudInverterDeviceBean deviceBean) {
try {
if (deviceBean == null) {
return;
@@ -279,7 +292,8 @@
* @param whetherToAdd true琛ㄧず鐢ㄥ閲�,false琛ㄧず鐢ㄥ叏閲�
*/
public void uploadOidDataToCloud(String homeId, List<GatewayBean> list, boolean whetherToAdd, CloudCallBeak<Boolean> callBeak) {
- if (list == null || list.size() == 0) {
+
+ if (list == null || list.isEmpty()) {
return;
}
if (whetherToAdd) {
@@ -334,7 +348,7 @@
}
newOidList.addAll(oidBeanList);
if (atomicInteger.get() == list.size()) {
- if (newOidList.size() == 0) {
+ if (newOidList.isEmpty()) {
return;
}
// //澧為噺娣诲姞oid
@@ -369,7 +383,7 @@
public void onError(HDLLinkException e) {
atomicInteger.set(atomicInteger.get() + 1);
if (atomicInteger.get() == list.size()) {
- if (newOidList.size() == 0) {
+ if (newOidList.isEmpty()) {
HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
return;
}
@@ -422,12 +436,26 @@
cloudCallBeak.onSuccess(true);
//涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔�
List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId);
- uploadOidDataToCloud(UserConfigManage.getInstance().getHomeId(), list, true, null);
+ uploadOidDataToCloud(homeId, list, true, null);
}
}
@Override
public void onFailure(HDLException e) {
+ //娣诲姞閫嗗彉鍣ㄥけ璐ュ悗鍒濆鍖栭�嗗彉鍣�
+ HdlLogLogic.print("娣诲姞閫嗗彉鍣ㄥけ璐ュ悗寮�濮嬪垵濮嬪寲閫嗗彉鍣�-->", true);
+ HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + mac, true);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄥけ璐�-->mac:" + mac, true);
+ }
+ });
+
if (cloudCallBeak != null) {
cloudCallBeak.onFailure(e);
}
@@ -472,9 +500,12 @@
@Override
public void onFailure(HDLException e) {
+
if (cloudCallBeak != null) {
cloudCallBeak.onFailure(e);
}
+
+
}
});
}
@@ -595,6 +626,10 @@
* @param cloudCallBeak 鍥炶皟update
*/
public void fullUpdateOid(String homeId, List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
+ if (!UserConfigManage.getInstance().getHomeId().equals(homeId)) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�---褰撳墠浣忓畢id:" + UserConfigManage.getInstance().getHomeId() + "---涓婁紶浣忓畢id:" + homeId, true);
+ return;
+ }
if (oidList == null || oidList.size() == 0) {
HdlLogLogic.print("oid鍒楄〃涓虹┖锛屾棤娉曞叏閲忔洿鏂皁id鍒颁簯绔�---", true);
return;
@@ -650,6 +685,10 @@
* @param cloudCallBeak 鍥炶皟update
*/
public void updateOidAdd(String homeId, List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
+ if (!UserConfigManage.getInstance().getHomeId().equals(homeId)) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�---褰撳墠浣忓畢id:" + UserConfigManage.getInstance().getHomeId() + "---涓婁紶浣忓畢id:" + homeId, true);
+ return;
+ }
if (oidList == null || oidList.size() == 0) {
HdlLogLogic.print("oid鍒楄〃涓虹┖锛屾棤娉曞閲忔坊鍔爋id鍒颁簯绔�---", true);
return;
@@ -691,6 +730,42 @@
cloudCallBeak.onFailure(e);
}
HdlLogLogic.print("澧為噺娣诲姞oid鍒颁簯绔け璐�---" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
+
+ }
+
+ /**
+ * 淇敼璁惧鍚嶇О閫嗗彉鍣˙MS鐢垫睜鍖�
+ * 鎻忚堪: 淇敼璁惧鍚嶇О锛屾敮鎸侀�嗗彉鍣紝BMS锛岀數姹犲寘璁惧鍚嶇О淇敼
+ *
+ * @param homeId 浣忓畢id
+ * @param deviceType 璁惧绫诲瀷(INV:閫嗗彉鍣�,BMS:BMS鎺у埗鐩�,BATTERY:鐢垫睜鍗曞厓)
+ * @param deviceId 璁惧id(deviceType = INV 鏄�嗗彉鍣╠eviceId;deviceType = BMS 鏄疊MS鐨刣eviceOidId;deviceType = BATTERY 鏄數姹犲寘鐨刣eviceOidId)
+ * @param cloudCallBeak 鍥炶皟update
+ */
+ public void setRename(String homeId, String deviceType, String deviceId, String name, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Device_Rename;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ json.addProperty("name", name);
+ json.addProperty("deviceType", deviceType);//璁惧绫诲瀷(INV:閫嗗彉鍣�,BMS:BMS鎺у埗鐩�,BATTERY:鐢垫睜鍗曞厓)
+ json.addProperty("deviceId", deviceId);//璁惧id(deviceType = INV 鏄�嗗彉鍣╠eviceId;deviceType = BMS 鏄疊MS鐨刣eviceOidId;deviceType = BATTERY 鏄數姹犲寘鐨刣eviceOidId)
+ // json.addProperty("zoneType", "password");//鍖哄煙
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String str) {
+
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
}
});
@@ -846,22 +921,31 @@
* @param mac 缃戝叧mac
* @param linkCallBack 鍥炶皟
*/
- public void getGatewayInfo(String mac, LinkCallBack<GatewayBean> linkCallBack) {
+ public void getGatewayInfo(String mac, LinkCallBack<InverterBean> linkCallBack) {
String requestUrl = TopicApi.GET_GATEWAY_INFO;
- TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
+ JsonObject json = new JsonObject();
+ json.addProperty("device_mac", mac);
+ TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String json) {
- if (TextUtils.isEmpty(json)) {
- if (linkCallBack != null) {
- linkCallBack.onSuccess(null);
- }
+ if (linkCallBack == null) {
return;
}
- Gson gson = new Gson();
- GatewayBean gatewayBean = gson.fromJson(json, GatewayBean.class);
- if (linkCallBack != null) {
- linkCallBack.onSuccess(gatewayBean);
+ if (TextUtils.isEmpty(json)) {
+ linkCallBack.onSuccess(null);
+ return;
}
+
+ Gson gson = new Gson();
+ Type typeOfT = new TypeToken<BaseLocalResponse<InverterBean>>() {
+ }.getType();
+ BaseLocalResponse<InverterBean> baseLocalResponse = gson.fromJson(json, typeOfT);
+ if (baseLocalResponse == null || baseLocalResponse.getObjects() == null) {
+ linkCallBack.onSuccess(new InverterBean());
+ } else {
+ linkCallBack.onSuccess(baseLocalResponse.getObjects());
+ }
+
}
@Override
@@ -980,85 +1064,63 @@
/**
* 鑾峰彇閫嗗彉鍣ㄥ垪琛�(鏁村悎浜戠鍜屾湰鍦板垪琛�)
- * 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囦负鍑�,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戯紝浠ユ湰鍦颁负涓�,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
+ * 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囦负鍑�,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘惁鍒欙紝娌℃湁澶栫綉鍙湁灞�鍩熺綉锛屼互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
*
* @param homeId 浣忓畢id
* @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
*/
public void getCurrentHomeLocalAndCloudGatewayList(String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
- HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
+ searchCurrentHomeGateway(homeId, new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
//灞�鍩熺綉鏈�2绉嶆儏鍐�(1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�2:鏈夊眬鍩熺綉锛屾病鏈夊缃�);
- HdlDeviceLogic.getInstance().getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
+ getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
- public void onSuccess(List<CloudInverterDeviceBean> list) {
- ///鎯呭喌1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�
- if (list == null || list.size() == 0) {
- //浜戠娌℃湁缁戝畾閫嗗彉鍣�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ public void onSuccess(List<CloudInverterDeviceBean> inverterDeviceList) {
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冨垪琛�
+ getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
+ if (loadCentreDeviceList != null) {
+ //鍚堝苟璐熻浇涓績璁惧鍒楄〃锛岀劧鍚庡湪涓�璧峰仛澶勭悊
+ inverterDeviceList.addAll(loadCentreDeviceList);
+ }
+ List<String> removeSidList = new ArrayList<>();
+ for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
+ if (querySidInverter(inverterDeviceList, gatewayBean.getSid())) {
+ //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
+ removeSidList.add(gatewayBean.getSid());
+ }
+ }
+ for (int i = 0; i < removeSidList.size(); i++) {
+ //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
+ removeLocalInverter(removeSidList.get(i));
+ }
+ //鎯呭喌1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�
+ setDeviceRemoteInfo(inverterDeviceList, homeId, cloudCallBeak);
}
- return;
- }
- //璁板綍鏉℃暟
- AtomicInteger atomicInteger = new AtomicInteger(0);
- for (int i = 0; i < list.size(); i++) {
- CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
- //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
- getDeviceRemoteInfo(homeId, cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
- @Override
- public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
- atomicInteger.set(atomicInteger.get() + 1);
- //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
- refreshGatewayCacheData(true, cloudInverterDeviceBean, deviceRemoteInfo, homeId);
- //鏈�鍚庝竴鏉℃墠鍋氬垹闄ら�嗗彉鍣ㄩ�昏緫澶勭悊
- if (atomicInteger.get() == list.size()) {
- //鏀堕泦鍒犻櫎閫嗗彉鍣╯id
- List<String> removeSidList = new ArrayList<>();
- for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
- GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
- if (!querySidInverter(list, gatewayBean.getSid())) {
- //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
- removeSidList.add(gatewayBean.getSid());
- }
- }
- for (int i = 0; i < removeSidList.size(); i++) {
- //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
- removeLocalInverter(removeSidList.get(i));
- }
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
- }
- }
- }
- @Override
- public void onFailure(HDLException e) {
- atomicInteger.set(atomicInteger.get() + 1);
- //褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鍦ㄨ繖閲屽仛鍒犻櫎閫嗗彉鍣ㄩ�昏緫澶勭悊
- if (atomicInteger.get() == list.size()) {
- //鏀堕泦鍒犻櫎閫嗗彉鍣╯id
- List<String> removeSidList = new ArrayList<>();
- for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
- GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
- if (!querySidInverter(list, gatewayBean.getSid())) {
- //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
- removeSidList.add(gatewayBean.getSid());
- }
- }
- for (int i = 0; i < removeSidList.size(); i++) {
- //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
- removeLocalInverter(removeSidList.get(i));
- }
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
- }
+ @Override
+ public void onFailure(HDLException e) {
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛屼粛鐒跺鐞嗛�嗗彉鍣ㄨ澶囧垪琛�
+ List<String> removeSidList = new ArrayList<>();
+ for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
+ if (querySidInverter(inverterDeviceList, gatewayBean.getSid())) {
+ //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
+ removeSidList.add(gatewayBean.getSid());
}
- HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
}
- });
- }
+ for (int i = 0; i < removeSidList.size(); i++) {
+ //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
+ removeLocalInverter(removeSidList.get(i));
+ }
+ //鎯呭喌1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�
+ setDeviceRemoteInfo(inverterDeviceList, homeId, cloudCallBeak);
+ }
+ });
}
@@ -1067,9 +1129,48 @@
public void onFailure(HDLException e) {
///鎯呭喌2:鏈夊眬鍩熺綉锛屾病鏈夊缃�;
//鏈湴鏈夐�嗗彉鍣ㄥ垪琛�,鑾峰彇浜戠缁戝畾閫嗗彉鍣ㄥけ璐�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
- }
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冨垪琛�
+ getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
+ if (loadCentreDeviceList == null) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ }
+ return;
+ }
+ List<String> removeSidList = new ArrayList<>();
+ for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
+ if (!isLoadCenterSpk(gatewayBean.getSpk())) {
+ //涓嶆槸璐熻浇涓績鐨剆pk涓嶅仛澶勭悊锛�
+ continue;
+ }
+ if (querySidInverter(loadCentreDeviceList, gatewayBean.getSid())) {
+ //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
+ removeSidList.add(gatewayBean.getSid());
+ }
+ }
+ for (int i = 0; i < removeSidList.size(); i++) {
+ //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
+ removeLocalInverter(removeSidList.get(i));
+ }
+ //鎯呭喌1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�
+ setDeviceRemoteInfo(loadCentreDeviceList, homeId, cloudCallBeak);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ }
+ }
+ });
+
+// if (cloudCallBeak != null) {
+// cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+// }
}
});
}
@@ -1077,62 +1178,63 @@
@Override
public void onError(HDLLinkException e) {
//澶栫綉鍙湁1绉嶆儏鍐�(鏈湴鎼滅储閫嗗彉鍣ㄥ垪琛ㄥけ璐ヤ簡)
- HdlDeviceLogic.getInstance().getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
+ getCloudInverterDeviceList(homeId, 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(new ArrayList<>());
+ public void onSuccess(List<CloudInverterDeviceBean> cloudInverterList) {
+ //鍐嶅悜浜戠鑾峰彇璐熻浇涓績鍒楄〃
+ getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
+ //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
+ HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+ List<CloudInverterDeviceBean> newList = new ArrayList<>();
+ if (cloudInverterList != null) {
+ newList.addAll(cloudInverterList);
+ }
+ if (loadCentreDeviceList != null) {
+ newList.addAll(loadCentreDeviceList);
+ }
+ //閫嗗彉鍣ㄥ垪琛ㄥ拰璐熻浇涓績鍒楄〃鐩稿姞
+ setDeviceRemoteInfo(newList, homeId, cloudCallBeak);
}
- HdlLogLogic.print("鍦ㄥ彧鏈夈�愬缃戙�戞儏鍐典笅鑾峰彇浜戠閫嗗彉鍣ㄥ垪琛ㄨ繑鍥炵┖鍒楄〃", true);
- return;
- }
- //璁板綍鏉℃暟
- AtomicInteger atomicInteger = new AtomicInteger(0);
- for (int i = 0; i < list.size(); i++) {
- CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
-
- //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
- getDeviceRemoteInfo(homeId, cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
- @Override
- public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
- atomicInteger.set(atomicInteger.get() + 1);
- //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
- refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo, homeId);
- //鍒版渶鍚庝竴鏉★紝鎵嶆湁鍥炶皟
- if (atomicInteger.get() == list.size()) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
- }
- }
- }
-
- @Override
- public void onFailure(HDLException e) {
- atomicInteger.set(atomicInteger.get() + 1);
- //褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鏈夊洖璋�
- if (atomicInteger.get() == list.size()) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
- }
- }
- HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触---msg---" + e.getMsg() + "(" + e.getCode() + ")");
- }
- });
- }
-
-
+ @Override
+ public void onFailure(HDLException e) {
+ //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冨垪琛ㄥけ璐�,鐩存帴杩斿洖閫嗗彉鍣ㄥ垪琛紱
+ HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+ setDeviceRemoteInfo(cloudInverterList, homeId, cloudCallBeak);
+ }
+ });
+// //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
+// HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+// setDeviceRemoteInfo(list, homeId, cloudCallBeak);
}
@Override
public void onFailure(HDLException e) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
- }
+ //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛ㄥけ璐�
+ //鍐嶅悜浜戠鑾峰彇璐熻浇涓績鍒楄〃
+ getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
+ //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
+ HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+ //閫嗗彉鍣ㄥ垪琛ㄥ拰璐熻浇涓績鍒楄〃
+ setDeviceRemoteInfo(loadCentreDeviceList, homeId, cloudCallBeak);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+// if (cloudCallBeak != null) {
+// cloudCallBeak.onFailure(e);
+// }
}
});
}
@@ -1140,19 +1242,71 @@
}
/**
- * 閫氳繃sid鏌ヨ閫嗗彉鍣�
+ * 璁剧疆璁惧鐨勮繙绋嬩俊鎭紙鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜绛変俊鎭級
+ *
+ * @param list 浜戠涓婄殑閫嗗彉鍣ㄥ垪琛�
+ * @param homeId 浣忓畢id
+ * @param cloudCallBeak 鍥炶皟
+ */
+ public void setDeviceRemoteInfo(List<CloudInverterDeviceBean> list, String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
+ if (list == null || list.size() == 0) {
+ //浜戠娌℃湁缁戝畾閫嗗彉鍣�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ }
+
+ return;
+ }
+ AtomicInteger atomicInteger = new AtomicInteger(0);
+ for (int i = 0; i < list.size(); i++) {
+ CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+ //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
+ getDeviceRemoteInfo(homeId, cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
+ @Override
+ public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
+ refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo, homeId);
+ //鍒版渶鍚庝竴鏉★紝鎵嶆湁鍥炶皟
+ if (atomicInteger.get() == list.size()) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ }
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ //褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鏈夊洖璋�
+ if (atomicInteger.get() == list.size()) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
+ }
+ }
+ HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触---msg---" + e.getMsg() + "(" + e.getCode() + ")");
+ }
+ });
+ }
+
+ }
+
+ /**
+ * 閫氳繃sid鏌ヨ閫嗗彉鍣ㄦ槸鍚﹀瓨缁戝畾鍦ㄤ簯绔�
*
* @param list 浜戠涓婇�嗗彉鍣ㄥ垪琛�
- * @return 瀛樺湪涓簍rue, 鍚﹀垯涓篺alse
+ * @return true涓嶅瓨鍦紝鍚﹀垯瀛樺湪
*/
private boolean querySidInverter(List<CloudInverterDeviceBean> list, String sid) {
+ int exists_value = -1;
for (int i = 0; i < list.size(); i++) {
CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
if (sid.equals(cloudInverterDeviceBean.getSid())) {
- return true;
+ exists_value = 1;
+ break;
}
}
- return false;
+ return exists_value == -1;
}
/**
@@ -1207,6 +1361,16 @@
}
/**
+ * 鍒ゆ柇spk鏄惁鏄礋杞戒腑蹇�
+ *
+ * @param spk spk
+ * @return 鐪�=true锛屽惁鍒欒繑鍥瀎alse
+ */
+ private boolean isLoadCenterSpk(String spk) {
+ return Objects.equals(spk, LC_SPK);
+ }
+
+ /**
* 娓呯┖閫嗗彉鍣ㄤ綇瀹卛d
*
* @param mac mac
@@ -1247,10 +1411,10 @@
*
* @param gatewayCallBack -
*/
- public void searchCurrentHomeGateway(GatewayCallBack gatewayCallBack) {
+ public void searchCurrentHomeGateway(String homeId, GatewayCallBack gatewayCallBack) {
List<String> spks = this.getGatewaySpk();
//缃戝叧鎼滅储
- HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack);
+ HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(homeId, spks, true, gatewayCallBack);
}
/**
@@ -1271,8 +1435,8 @@
* @param deviceMac 璁惧mac锛�
* @param callBeak 杩斿洖 true=鏈湴杩炴帴;false=杩滅▼;
*/
- public void isLocalConnect(String deviceMac, CloudCallBeak<Boolean> callBeak) {
- searchCurrentHomeGateway(new GatewayCallBack() {
+ public void isLocalConnect(String homeId, String deviceMac, CloudCallBeak<Boolean> callBeak) {
+ searchCurrentHomeGateway(homeId, new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
if (gatewayBeanList == null || gatewayBeanList.size() == 0) {
@@ -1359,8 +1523,191 @@
/**
+ * 鑾峰彇鏈繍琛岄�嗗彉鍣ㄥ垪琛�
+ *
+ * @param homeId 鐢电珯id
+ */
+ public void getListNotRun(String homeId, CloudCallBeak<List<NotRunBean>> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Device_listNotRun;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ // json.addProperty("zoneType", "password");//鍖哄煙
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new ArrayList<>());
+ }
+ }
+ Type type = new TypeToken<List<NotRunBean>>() {
+ }.getType();
+ List<NotRunBean> list = new Gson().fromJson(jsonStr, type);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(list);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+ }
+
+ /**
+ * 閫嗗彉鍣ㄥ紑鏈�
+ *
+ * @param homeId 鐢电珯id
+ * @param arrayList 璁惧id鏁扮粍
+ */
+ public void setDeviceStartup(String homeId, JsonArray arrayList, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Device_startup;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ json.add("deviceIds", arrayList);
+ // json.addProperty("zoneType", "password");//鍖哄煙
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇璁惧璇︽儏
+ *
+ * @param homeId 鐢电珯id
+ * @param arrayList 璁惧id鏁扮粍
+ */
+ public void getDeviceInfo(String homeId, JsonArray arrayList, CloudCallBeak<List<DeviceInfoBean>> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Device_info;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ json.add("deviceIds", arrayList);
+ // json.addProperty("zoneType", "password");//鍖哄煙
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new ArrayList<>());
+ }
+ return;
+ }
+ Gson gson = new Gson();
+ List<DeviceInfoBean> list = gson.fromJson(jsonStr, new TypeToken<List<DeviceInfoBean>>() {
+ }.getType());
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(list);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+ }
+
+
+ /**
+ * 鑾峰彇鐢电珯涓嬭礋杞芥帶鍒朵腑蹇冨垪琛�
+ *
+ * @param homeId 鐢电珯id
+ */
+ public void getLoadCentreDeviceList(String homeId, CloudCallBeak<List<CloudInverterDeviceBean>> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Device_loadCentreDevices;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ // json.addProperty("zoneType", "password");//鍖哄煙
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new ArrayList<>());
+ }
+ }
+ Type type = new TypeToken<List<CloudInverterDeviceBean>>() {
+ }.getType();
+ List<CloudInverterDeviceBean> list = new Gson().fromJson(jsonStr, type);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(list);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+ }
+
+ /**
+ * 閫嗗彉鍣ㄥ瘑鐮佺櫥褰�
+ *
+ * @param mac 閫嗗彉鍣╩ac
+ * @param password 閫嗗彉鍣ㄥ瘑鐮�
+ */
+ public void getPasswordVerification(String mac, String password, LinkCallBack<LocalResponse> callBeak) {
+ String requestUrl = TopicApi.DELETING_GATEWAY_password_verifiy;
+ JsonObject json = new JsonObject();
+ json.addProperty("password", password);
+ json.addProperty("mac", mac);
+ TcpClient.getInstance().sendDataToLinkGateway(mac, false, requestUrl, json, "", new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ try {
+
+ Gson gson = new Gson();
+ LocalResponse localResponse = gson.fromJson(msg, LocalResponse.class);
+ if (localResponse == null) {
+ localResponse = new LocalResponse();
+ }
+ if (callBeak != null) {
+ callBeak.onSuccess(localResponse);
+ }
+ } catch (Exception e) {
+ if (callBeak != null) {
+ callBeak.onSuccess(new LocalResponse());
+ }
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ if (callBeak != null) {
+ callBeak.onError(e);
+ }
+ }
+ });
+ }
+
+ /**
* 鍒锋柊閫嗗彉鍣ㄧ紦瀛樹俊鎭�(鍖呮嫭璁剧疆mqtt绉橀挜锛�
- * 娉�:
+ * 娉�: //鐩殑鏄负浜嗚幏鍙栨嬁鍒扮綉鍏矷D锛宮qtt閫氳绉橀挜绛変俊鎭紝缂撳瓨鏈湴閫嗗彉鍣ㄥ垪琛ㄩ噷闈紝鍙戦�佹暟鎹暟鎹椂鑷姩鍘荤紦瀛樺垪琛ㄩ噷闈㈠幓鏌ユ壘锛�
* 1:鏈湴瀛樺湪,鏇存柊淇℃伅鍗冲彲;
* 2:鏈湴涓嶅瓨鍦�,鍒欒櫄鎷熶竴涓�嗗彉鍣ㄥ璞℃坊鍔犲湪鏈湴;
*
@@ -1384,8 +1731,9 @@
HDLLinkConfig.getInstance().setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
}
+
gatewayBean.setHomeId(homeId);//浣忓畢id
- gatewayBean.setDeviceStatus(cloudInverterDeviceBean.getDeviceStatus());//璁剧疆缃戝叧鐘舵��
+ gatewayBean.setDeviceStatus(cloudInverterDeviceBean.getDeviceStatus());//璁剧疆缃戝叧鐘舵��(1 锛� 杩炴帴涓�,2 锛� 鏁呴殰, 3 锛� 杩愯,4 锛� 绂荤嚎)
gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId());//璁剧疆link璁惧id
gatewayBean.setDevice_mac(cloudInverterDeviceBean.getOsn());//璁剧疆mac
gatewayBean.setOid(cloudInverterDeviceBean.getOid());//璁惧oid
@@ -1393,12 +1741,17 @@
gatewayBean.setDevice_name(cloudInverterDeviceBean.getName());//璁惧鍚嶇О
gatewayBean.setGatewayType(cloudInverterDeviceBean.getSpk());//璁剧疆spk
gatewayBean.setLocalEncrypt(true);
+ //绂荤綉閫嗗彉鍣�
+ gatewayBean.setOgMaster(cloudInverterDeviceBean.isOgMaster());
+ //閫嗗彉鍣�
gatewayBean.setMaster(GatewayMasterType.MasterTrue);//榛樿閮芥槸涓婚�嗗彉鍣�(浠ュ悗鏀寔浠庨�嗗彉鍣ㄨ鏇存敼)
gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵��
gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙�
gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О
+ gatewayBean.setDeviceType(cloudInverterDeviceBean.getDeviceType());//璁惧绫诲瀷(INV:閫嗗彉鍣�;BMS:BMS鎺у埗鐩�;BATTERY:鐢垫睜鍗曞厓)
gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�,閫嗗彉鍣ㄥ湴鍧�
gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
+ gatewayBean.setOutputActivePower(cloudInverterDeviceBean.getOutputActivePower());//閫嗗彉鍣ㄨ緭鍑烘湁鍔熷姛鐜�
gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
if (!TextUtils.isEmpty(cloudInverterDeviceBean.getOmodel())) {
//鍙兘璁惧娌℃湁涓婃姤缁欎簯绔�,寤鸿缁戝畾閫嗗彉鍣ㄦ椂鍊欒拷鍔犱竴涓弬鏁�;
@@ -1417,7 +1770,9 @@
*/
public List<String> getGatewaySpk() {
List<String> spks = new ArrayList<>();
- spks.add(DEVICE_SPK);
+ spks.add(INVERTER_DEVICE_SPK);
+ spks.add(LC_SPK);
+ spks.add(OFF_INVERTER_OG_SPK);
return spks;
}
@@ -1433,5 +1788,16 @@
return false;
}
- public final String DEVICE_SPK = "energy.hdl_inverter";
+ /**
+ * 閫嗗彉鍣╯pk
+ */
+ public final String INVERTER_DEVICE_SPK = "energy.hdl_inverter";
+ /**
+ * 璐熻浇涓績spk
+ */
+ public final String LC_SPK = "energy.hdl_lc";
+ /**
+ * 绂荤嚎閫嗗彉鍣╯pk
+ */
+ public final String OFF_INVERTER_OG_SPK = "energy.inverter_og";
}
--
Gitblit v1.8.0