From c4ae4589c6c001329ebb731589b209e8ddcbf7ca Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 24 三月 2026 16:03:59 +0800
Subject: [PATCH] 2026年03月24日16:03:57
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 320 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 196 insertions(+), 124 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 8c6c8c8..69a5cce 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -13,6 +13,8 @@
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.DeviceType;
+import com.hdl.photovoltaic.enums.PowerStationType;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.TcpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
@@ -38,7 +40,6 @@
import java.lang.reflect.Type;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -1255,129 +1256,179 @@
* 鑾峰彇閫嗗彉鍣ㄥ垪琛�,鏁村悎浜戠閫嗗彉鍣ㄥ垪琛ㄥ拰鏈湴閫嗗彉鍣ㄥ垪琛�(璁惧绫诲瀷鏈�:骞剁綉閫嗗彉鍣紝绂荤嚎閫嗗彉鍣紝璐熻浇涓績璁惧);
* 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
*
- * @param homeId 浣忓畢id
- * @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
+ * @param homeId 浣忓畢id
+ * @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
+ * @param powerStationType 鐢电珯绫诲瀷锛堥�嗗彉鍣紝BMS鐢电珯锛�
*/
- public void getCurrentHomeLocalAndCloudGatewayList(String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
+ public void getCurrentHomeLocalAndCloudGatewayList(String homeId, String powerStationType, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
// HDLLinkLocalGateway.getInstance().getGatewayList().clear();//鍏堟竻绌轰箣鍓嶉�嗗彉鍣ㄥ垪琛�
- searchCurrentHomeGateway(homeId, new GatewayCallBack() {
- @Override
- public void onSuccess(List<GatewayBean> gatewayBeanList) {
- //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
- getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
- @Override
- 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);
- }
- //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
- setDeviceRemoteInfo(inverterDeviceList, homeId, cloudCallBeak);
+ if (powerStationType.equals(PowerStationType.BMS)) {
+ searchCurrentHomeGateway(homeId, new GatewayCallBack() {
+ @Override
+ public void onSuccess(List<GatewayBean> gatewayBeanList) {
+ //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
+ getCloudBmsDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> inverterDeviceList) {
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
+ setDeviceRemoteInfo(inverterDeviceList, homeId, cloudCallBeak);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ //鏈湴鏈夐�嗗彉鍣ㄥ垪琛�,鑾峰彇浜戠缁戝畾閫嗗彉鍣ㄥけ璐�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
}
- @Override
- public void onFailure(HDLException e) {
- //鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛屼粛鐒跺鐞嗛�嗗彉鍣ㄨ澶囧垪琛�
- //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
- setDeviceRemoteInfo(inverterDeviceList, homeId, cloudCallBeak);
- }
- });
+ }
+ });
+ }
-
- }
-
- @Override
- public void onFailure(HDLException e) {
- //鏈湴鏈夐�嗗彉鍣ㄥ垪琛�,鑾峰彇浜戠缁戝畾閫嗗彉鍣ㄥけ璐�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
- //鍚戜簯绔幏鍙栬礋杞戒腑蹇冨垪琛�
- getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
- @Override
- public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
- if (loadCentreDeviceList == null) {
- if (cloudCallBeak != null) {
- //娌℃湁鏁版嵁锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
- cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
- }
- return;
- }
- //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
- setDeviceRemoteInfo(loadCentreDeviceList, homeId, cloudCallBeak);
- }
-
- @Override
- public void onFailure(HDLException e) {
- //鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
- }
- }
- });
-
- }
- });
- }
-
- @Override
- public void onError(HDLLinkException e) {
+ @Override
+ public void onError(HDLLinkException e) {
// //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
// HDLLinkLocalGateway.getInstance().getGatewayList().clear();
- //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
- getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
- @Override
- public void onSuccess(List<CloudInverterDeviceBean> cloudInverterList) {
- //鍐嶅悜浜戠鑾峰彇璐熻浇涓績鍒楄〃
- getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
- @Override
- public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
+ //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
+ getCloudBmsDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> cloudInverterList) {
+ //鏁村悎璁惧鍒楄〃鍚�,鍐嶄竴璧疯缃澶囩殑杩滅▼淇℃伅
+ setDeviceRemoteInfo(cloudInverterList, homeId, cloudCallBeak);
+ }
- List<CloudInverterDeviceBean> newList = new ArrayList<>();
- if (cloudInverterList != null) {
- //娣诲姞閫嗗彉鍣ㄨ澶囧垪琛�
- newList.addAll(cloudInverterList);
+ @Override
+ public void onFailure(HDLException e) {
+ //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛ㄥけ璐�
+ //閮芥槸鑾峰彇澶辫触鐨勮瘽,鐩存帴杩斿洖绌哄垪琛�;
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new ArrayList<>());
+ }
+ }
+ });
+ }
+ });
+ } else {
+ searchCurrentHomeGateway(homeId, new GatewayCallBack() {
+ @Override
+ public void onSuccess(List<GatewayBean> gatewayBeanList) {
+ //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
+ getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ 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);
+ }
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
+ setDeviceRemoteInfo(inverterDeviceList, homeId, cloudCallBeak);
}
- if (loadCentreDeviceList != null) {
- //娣诲姞璐熻浇涓績璁惧鍒楄〃
- newList.addAll(loadCentreDeviceList);
+
+ @Override
+ public void onFailure(HDLException e) {
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛屼粛鐒跺鐞嗛�嗗彉鍣ㄨ澶囧垪琛�
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
+ setDeviceRemoteInfo(inverterDeviceList, homeId, cloudCallBeak);
}
- //鏁村悎璁惧鍒楄〃鍚�,鍐嶄竴璧疯缃澶囩殑杩滅▼淇℃伅
- setDeviceRemoteInfo(newList, homeId, cloudCallBeak);
- }
+ });
- @Override
- public void onFailure(HDLException e) {
- //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
- setDeviceRemoteInfo(cloudInverterList, homeId, cloudCallBeak);
- }
- });
- }
- @Override
- public void onFailure(HDLException e) {
- //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛ㄥけ璐�
- //鍐嶅悜浜戠鑾峰彇璐熻浇涓績鍒楄〃
- getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
- @Override
- public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
- //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
- setDeviceRemoteInfo(loadCentreDeviceList, homeId, cloudCallBeak);
- }
+ }
- @Override
- public void onFailure(HDLException e) {
- //閮芥槸鑾峰彇澶辫触鐨勮瘽,鐩存帴杩斿洖绌哄垪琛�;
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(new ArrayList<>());
+ @Override
+ public void onFailure(HDLException e) {
+ //鏈湴鏈夐�嗗彉鍣ㄥ垪琛�,鑾峰彇浜戠缁戝畾閫嗗彉鍣ㄥけ璐�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冨垪琛�
+ getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
+ if (loadCentreDeviceList == null) {
+ if (cloudCallBeak != null) {
+ //娌℃湁鏁版嵁锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
+ }
+ return;
+ }
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
+ setDeviceRemoteInfo(loadCentreDeviceList, homeId, cloudCallBeak);
}
- }
- });
- }
- });
- }
- });
+
+ @Override
+ public void onFailure(HDLException e) {
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null, false));
+ }
+ }
+ });
+
+ }
+ });
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+// //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
+// HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+ //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
+ getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> cloudInverterList) {
+ //鍐嶅悜浜戠鑾峰彇璐熻浇涓績鍒楄〃
+ getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
+
+ List<CloudInverterDeviceBean> newList = new ArrayList<>();
+ if (cloudInverterList != null) {
+ //娣诲姞閫嗗彉鍣ㄨ澶囧垪琛�
+ newList.addAll(cloudInverterList);
+ }
+ if (loadCentreDeviceList != null) {
+ //娣诲姞璐熻浇涓績璁惧鍒楄〃
+ newList.addAll(loadCentreDeviceList);
+ }
+ //鏁村悎璁惧鍒楄〃鍚�,鍐嶄竴璧疯缃澶囩殑杩滅▼淇℃伅
+ setDeviceRemoteInfo(newList, homeId, cloudCallBeak);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
+ setDeviceRemoteInfo(cloudInverterList, homeId, cloudCallBeak);
+ }
+ });
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛ㄥけ璐�
+ //鍐嶅悜浜戠鑾峰彇璐熻浇涓績鍒楄〃
+ getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
+ setDeviceRemoteInfo(loadCentreDeviceList, homeId, cloudCallBeak);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ //閮芥槸鑾峰彇澶辫触鐨勮瘽,鐩存帴杩斿洖绌哄垪琛�;
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new ArrayList<>());
+ }
+ }
+ });
+ }
+ });
+ }
+ });
+ }
}
/**
@@ -1398,20 +1449,38 @@
AtomicInteger atomicInteger = new AtomicInteger(0);
for (int i = 0; i < list.size(); i++) {
CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
- if (cloudInverterDeviceBean == null || !cloudInverterDeviceBean.isActivate()) {
- //鏈縺娲昏澶�
- atomicInteger.set(atomicInteger.get() + 1);
- //娉ㄦ剰:杩欎釜閫嗗彉鍣ㄥ彧鑳芥湰鍦版帶鍒�(鍥犱负鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強GatewayID,鏃犳硶杩滅▼鎺у埗)
- //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
- refreshGatewayCacheData(false, cloudInverterDeviceBean, null, homeId);
- //鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋�
- if (atomicInteger.get() == list.size()) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
+ if (cloudInverterDeviceBean == null) {
+ if (cloudInverterDeviceBean.getDeviceType().equals(DeviceType.bms)) {
+ //鏈縺娲昏澶�
+ atomicInteger.set(atomicInteger.get() + 1);
+ //娉ㄦ剰:杩欎釜閫嗗彉鍣ㄥ彧鑳芥湰鍦版帶鍒�(鍥犱负鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強GatewayID,鏃犳硶杩滅▼鎺у埗)
+ //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
+ refreshGatewayCacheData(false, cloudInverterDeviceBean, null, homeId);
+ //鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋�
+ if (atomicInteger.get() == list.size()) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
+ }
+ }
+ HdlLogLogic.print("璁惧鏈縺娲�(mac:" + cloudInverterDeviceBean.getOsn() + "))", true);
+ continue;
+ } else {
+ if (!cloudInverterDeviceBean.isActivate()) {
+ //鏈縺娲昏澶�
+ atomicInteger.set(atomicInteger.get() + 1);
+ //娉ㄦ剰:杩欎釜閫嗗彉鍣ㄥ彧鑳芥湰鍦版帶鍒�(鍥犱负鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強GatewayID,鏃犳硶杩滅▼鎺у埗)
+ //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
+ refreshGatewayCacheData(false, cloudInverterDeviceBean, null, homeId);
+ //鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋�
+ if (atomicInteger.get() == list.size()) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false));
+ }
+ }
+ HdlLogLogic.print("璁惧鏈縺娲�(mac:" + cloudInverterDeviceBean.getOsn() + "))", true);
+ continue;
}
}
- HdlLogLogic.print("璁惧鏈縺娲�(mac:" + cloudInverterDeviceBean.getOsn() + "))", true);
- continue;
}
//鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
getDeviceRemoteInfo(homeId, cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
@@ -1911,7 +1980,7 @@
gatewayBean.setOutputActivePower(cloudInverterDeviceBean.getOutputActivePower());//閫嗗彉鍣ㄨ緭鍑烘湁鍔熷姛鐜�
gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
if (!TextUtils.isEmpty(cloudInverterDeviceBean.getOmodel())) {
- //鍙兘璁惧娌℃湁涓婃姤缁欎簯绔�,寤鸿缁戝畾閫嗗彉鍣ㄦ椂鍊欒拷鍔犱竴涓弬鏁�;//todo 娣诲姞璁惧鍨嬪彿BMS鑾峰彇绫诲瀷鍊间笉涓�鏍�
+ //鍙兘璁惧娌℃湁涓婃姤缁欎簯绔�,寤鸿缁戝畾閫嗗彉鍣ㄦ椂鍊欒拷鍔犱竴涓弬鏁�;
gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
}
gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
@@ -1919,7 +1988,10 @@
gatewayBean.setPopUpgrade(cloudInverterDeviceBean.isPopUpgrade());//鏀硅澶囨槸鍚︽湁寮圭獥鍗囩骇
gatewayBean.setSubPopUpgrade(cloudInverterDeviceBean.isSubPopUpgrade());//涓嬫寕璁惧鏄惁鏈夊脊绐楀崌绾�
-
+ if (cloudInverterDeviceBean.getDeviceType().equals(DeviceType.bms)) {
+ gatewayBean.setDeviceOidId(cloudInverterDeviceBean.getDeviceOidId());
+ gatewayBean.setFwVersion(cloudInverterDeviceBean.getFwVersion());
+ }
}
--
Gitblit v1.8.0