From f50e8e60e9da99e4f69d8ab76810dc7e5fb448bc Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 02 十二月 2024 10:29:09 +0800
Subject: [PATCH] 2024年12月02日10:29:05
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
index 511f6e9..d240831 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
@@ -14,11 +14,13 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityHouseListEditBinding;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
+import com.hdl.photovoltaic.enums.MessageStateType;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
+import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
@@ -30,6 +32,8 @@
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.List;
@@ -42,7 +46,7 @@
private ActivityHouseListEditBinding viewBinding;
private HouseListAdapter houseListAdapter;
- private List<HouseIdBean> houseListBeanIDList;
+ private List<HouseIdBean> houseListBeanIDList = new ArrayList<>();
@Override
@@ -61,17 +65,20 @@
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
initEvent();
+ if (this.houseListBeanIDList.size() == 0) {
+ downReadData(false);
+ }
}
private void initData() {
- this.houseListBeanIDList = new ArrayList<>();
+ this.houseListBeanIDList.clear();
this.houseListBeanIDList.addAll(HdlResidenceLogic.getInstance().getHouseIdList());
for (int i = 0; i < this.houseListBeanIDList.size(); i++) {
this.houseListBeanIDList.get(i).setDelIcon(true);
this.houseListBeanIDList.get(i).setMove(true);
-
}
}
+
@Override
public void onBackPressed() {
@@ -86,7 +93,7 @@
private void initEvent() {
//杩斿洖鎸夐挳
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
sendEventBus();
@@ -133,7 +140,7 @@
}
});
- //鐢电珯绉诲姩浣嶇疆鎸夐挳
+ //鐢电珯鍒犻櫎浣嶇疆鎸夐挳
houseListAdapter.setDelOnclickListener(new HouseListAdapter.OnDelClickListener() {
@Override
public void onDelClick(int position, HouseIdBean houseIdBean) {
@@ -192,10 +199,10 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.power_station_editing);
+ viewBinding.toolbarTopRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.power_station_editing);
LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
houseListAdapter = new HouseListAdapter(_mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
@@ -203,6 +210,7 @@
houseListAdapter.setList(this.houseListBeanIDList);
this.nullDataUpdateUi(houseListBeanIDList);
}
+
/**
* 鍒犻櫎鐢电珯,閫嗗彉鍣�
@@ -261,6 +269,9 @@
* @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑
*/
private void downReadData(boolean isRefreshing) {
+ if (!isRefreshing) {
+ showLoading();
+ }
//鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃
HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
@Override
@@ -271,6 +282,8 @@
if (isRefreshing) {
//鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦�
viewBinding.fragmentHouseSrl.setRefreshing(false);
+ } else {
+ hideLoading();
}
if (list != null && list.size() > 0) {
//鏇存柊缂撳瓨
@@ -297,7 +310,10 @@
if (isRefreshing) {
//鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦�
viewBinding.fragmentHouseSrl.setRefreshing(false);
+ } else {
+ hideLoading();
}
+
}
}, _mActivity, ShowErrorMode.YES);
@@ -316,6 +332,7 @@
}
}
+
/**
* 娌℃湁鐢电珯鍒楄〃鐨勬牱寮�
*/
--
Gitblit v1.8.0