From bcdd75fb55b4c887e10b660a31538bf15bfd1c82 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 13:17:36 +0800
Subject: [PATCH] 2025年07月31日13:17:34
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java
index 1c17dc3..8268619 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java
@@ -7,6 +7,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
+import android.text.TextUtils;
import android.view.View;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -73,6 +74,8 @@
getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍒濆鍖栨暟鎹�
initData();
+ //璁剧疆褰撳墠鐢电珯閫変腑鐘舵��
+ setSelectState();
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -81,10 +84,13 @@
// downReadData(false);
}
+ /**
+ * 鍒濆鍖栫數绔欏垪琛ㄦ暟鎹�
+ */
private void initData() {
this.houseListBeanIDList = new ArrayList<>();
this.houseListBeanIDList.addAll(HdlResidenceLogic.getInstance().getHouseIdList());
- setSelectState();
+// setSelectState();
}
private void initEvent() {
@@ -149,14 +155,14 @@
@Override
public void onSuccess(List<GatewayBean> list) {
//鍙戣捣鍒犻櫎鐢电珯鎸囦护
- deleteResidence(houseIdBean.getHomeId(), list);
+ deleteResidence(position, houseIdBean, list);
}
@Override
public void onFailure(HDLException e) {
//鍙戣捣鍒犻櫎鐢电珯鎸囦护
- deleteResidence(houseIdBean.getHomeId(), null);
+ deleteResidence(position, houseIdBean, null);
}
});
@@ -283,7 +289,7 @@
if (houseListAdapter != null) {
//閲嶆柊鑾峰彇鍒楄〃鏁版嵁
initData();
- refreshDetails();
+ refreshDetails("");
//鏇存柊鐢电珯閫変腑鐘舵��
setSelectState();
//鏇存柊鍒楄〃鏁版嵁
@@ -405,23 +411,25 @@
/**
* 鍒犻櫎鐢电珯
*
- * @param homeId 鐢电珯id
- * @param list 閫嗗彉鍣ㄥ垪琛�
+ * @param position 绱㈠紩鍊�
+ * @param houseIdBean 鐢电珯id瀵硅薄
+ * @param list 閫嗗彉鍣ㄥ垪琛�
*/
- private void deleteResidence(String homeId, List<GatewayBean> list) {
+ private void deleteResidence(final int position, final HouseIdBean houseIdBean, List<GatewayBean> list) {
//鍒犻櫎浣忓畢
- HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() {
+ HdlResidenceLogic.getInstance().delResidence(houseIdBean.getHomeId(), new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
hideLoading();
initializeInverter(list); //鍙戣捣鍒濆鍖栨寚浠ょ粰閫嗗彉鍣�;锛堟敞鎰�:鍓嶉潰宸插厛瑙ｇ粦浜戠閫嗗彉鍣紝mqtt閫氶亾宸叉柇寮�锛屽垵濮嬪寲鍙兘鏄湰鍦板彂閫�(鍏堟悳绱㈠眬鍩熺綉閫嗗彉鍣ㄥ垪琛紝寤虹珛鏈湴閫氳閫氶亾)锛�
- HdlResidenceLogic.getInstance().delHouseId(homeId);//鍒犻櫎鐢电珯缂撳瓨
+ HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId());//鍒犻櫎鐢电珯缂撳瓨
initData();//鍒濆鍖栫紦瀛樻暟鎹�
- refreshDetails();
- //鏇存柊鐢电珯閫変腑鐘舵��
- setSelectState();
- houseListAdapter.setList(houseListBeanIDList); //鏇存柊鍒楄〃鏁版嵁
+ refreshDetails(houseIdBean.getHomeId());
+ setSelectState();//鏇存柊鐢电珯閫変腑鐘舵��
+ if (houseListAdapter != null) {
+ houseListAdapter.setList(houseListBeanIDList); //鏇存柊鍒楄〃鏁版嵁
+ }
nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌�
}
@@ -524,7 +532,7 @@
* 閫氱煡uni鏇存柊鏁版嵁
* 锛堝湪骞冲彴涓婂垹闄绔綋鍓嶄綇瀹呭悗,鑾峰彇鍒楄〃瀹炴敹瑕侀�氱煡uni閭ｈ竟鏇存柊鐣岄潰鍗＄墖锛�
*/
- private void refreshDetails() {
+ private void refreshDetails(final String homeId) {
try {
List<HouseIdBean> localHouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
if (localHouseIdList.isEmpty()) {
@@ -535,15 +543,7 @@
uniCallBackBaseBean.setData(jsonObject);
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
} else {
- int select_home = -1;
- for (int i = 0; i < localHouseIdList.size(); i++) {
- if (localHouseIdList.get(i).getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
- select_home = i;
- break;
- }
- }
- if (select_home == -1) {
- //鎵句笉鍒伴粯璁ょ涓�涓�
+ if (homeId.equals(UserConfigManage.getInstance().getHomeId()) || TextUtils.isEmpty(UserConfigManage.getInstance().getHomeId())) {
HouseIdBean houseIdBean = localHouseIdList.get(0);
HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);
JsonObject jsonObject = new JsonObject();
--
Gitblit v1.8.0