From 51bd5829118714be826ab9de93d822615ef48a4f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 29 五月 2024 14:50:14 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 199 +++++++++++++++----------------------------------
1 files changed, 61 insertions(+), 138 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..efce83e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -3,7 +3,6 @@
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;
@@ -20,32 +19,20 @@
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.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.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.concurrent.atomic.AtomicInteger;
@@ -74,14 +61,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 +74,7 @@
}
}
- public List<DeviceBean> getDeviceList() {
+ public List<CloudInverterDeviceBean> getDeviceList() {
if (mListDevice == null) {
return new ArrayList<>();
}
@@ -184,7 +165,7 @@
* @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 +183,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);
}
@@ -225,7 +206,7 @@
*
* @param list -璁惧鍒楄〃
*/
- public void setListDevice(List<DeviceBean> list) {
+ public void setListDevice(List<CloudInverterDeviceBean> list) {
try {
if (list == null || list.size() == 0) {
return;
@@ -246,7 +227,7 @@
*
* @param deviceBean -璁惧瀵硅薄
*/
- public void setSingleDevice(DeviceBean deviceBean) {
+ public void setSingleDevice(CloudInverterDeviceBean deviceBean) {
try {
if (deviceBean == null) {
return;
@@ -994,73 +975,7 @@
@Override
public void onSuccess(List<CloudInverterDeviceBean> list) {
///鎯呭喌1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�
- 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(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));
- }
- }
- HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
- }
- });
- }
-
-
+ setDeviceRemoteInfo(list, homeId, cloudCallBeak);
}
@Override
@@ -1082,50 +997,7 @@
public void onSuccess(List<CloudInverterDeviceBean> list) {
//澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
HDLLinkLocalGateway.getInstance().getGatewayList().clear();
- if (list == null || list.size() == 0) {
- if (cloudCallBeak != null) {
- //浜戠涔熸病鏈夐�嗗彉鍣ㄥ垪琛�,杩斿洖绌哄垪琛ㄥ洖鍘�
- cloudCallBeak.onSuccess(new ArrayList<>());
- }
- 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() + ")");
- }
- });
- }
-
-
+ setDeviceRemoteInfo(list, homeId, cloudCallBeak);
}
@Override
@@ -1137,6 +1009,56 @@
});
}
});
+ }
+
+ /**
+ * 璁剧疆璁惧鐨勮繙绋嬩俊鎭紙鎷垮埌缃戝叧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() + ")");
+ }
+ });
+ }
+
}
/**
@@ -1360,7 +1282,7 @@
/**
* 鍒锋柊閫嗗彉鍣ㄧ紦瀛樹俊鎭�(鍖呮嫭璁剧疆mqtt绉橀挜锛�
- * 娉�:
+ * 娉�: //鐩殑鏄负浜嗚幏鍙栨嬁鍒扮綉鍏矷D锛宮qtt閫氳绉橀挜绛変俊鎭紝缂撳瓨鏈湴閫嗗彉鍣ㄥ垪琛ㄩ噷闈紝鍙戦�佹暟鎹暟鎹椂鑷姩鍘荤紦瀛樺垪琛ㄩ噷闈㈠幓鏌ユ壘锛�
* 1:鏈湴瀛樺湪,鏇存柊淇℃伅鍗冲彲;
* 2:鏈湴涓嶅瓨鍦�,鍒欒櫄鎷熶竴涓�嗗彉鍣ㄥ璞℃坊鍔犲湪鏈湴;
*
@@ -1397,6 +1319,7 @@
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.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
--
Gitblit v1.8.0