From ae57b0e8ca15e818e66b4edd4696804d81796327 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期五, 03 一月 2025 09:53:44 +0800 Subject: [PATCH] 2025年01月03日09:53:42 --- app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java index d5a42ac..be05aa2 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java @@ -47,6 +47,7 @@ private ActivityTestMainBinding viewBinding; private TestTitleAdapter testTitleAdapter; + private List<HouseIdBean> mHouseIdBeanList = new ArrayList<>(); private List<OidBean> mOidList; private GatewayBean mGatewayBean; @@ -70,7 +71,12 @@ viewBinding.listItemRl.setAdapter(testTitleAdapter); initView(); initEvent(); + readData(); + } + + private void readData() { + loadNextPageHouseList(true); } /** @@ -429,25 +435,30 @@ } /** - * 鍒锋柊UI锛堣澶囷級 + * 鍒锋柊UI锛堢數绔欙級 * * @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑 */ - private void loadNextPageDeviceList(boolean isRefreshing) { + private void loadNextPageHouseList(boolean isRefreshing) { - showLoading(); + if (isRefreshing) { + showLoading(getString(R.string.device_loading)); + } //鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃 - HdlDeviceLogic.getInstance().getPowerStationDeviceList("", 1, 200, new CloudCallBeak<PageNumberObject<CloudInverterDeviceBean>>() { + HdlResidenceLogic.getInstance().getResidenceIdList("", "", "", "", "", "", 1, 200, new CloudCallBeak<HdlResidenceLogic.HouseBeanClass>() { @Override - public void onSuccess(PageNumberObject<CloudInverterDeviceBean> pageNumberObject) { + public void onSuccess(HdlResidenceLogic.HouseBeanClass houseBeanClass) { HdlThreadLogic.runMainThread(new Runnable() { @Override public void run() { if (isRefreshing) { hideLoading(); } + mHouseIdBeanList.clear(); + //鏇存柊缂撳瓨 + mHouseIdBeanList.addAll(houseBeanClass.getList()); } - }, _mActivity, ShowErrorMode.YES); + }, _mActivity, ShowErrorMode.NO); } @@ -459,8 +470,9 @@ if (isRefreshing) { hideLoading(); } + } - }, _mActivity, ShowErrorMode.YES); + }, _mActivity, ShowErrorMode.NO); } }); } @@ -523,7 +535,8 @@ * 閫夋嫨鐢电珯璋冭瘯 */ public void selectHome() { - List<HouseIdBean> list = HdlResidenceLogic.getInstance().getHouseIdList(); +// List<HouseIdBean> list = HdlResidenceLogic.getInstance().getHouseIdList(); + List<HouseIdBean> list = this.mHouseIdBeanList; DialogHomeList dialogHomeList = new DialogHomeList(_mActivity, list); dialogHomeList.show(); dialogHomeList.DeviceOnclickListener(new HomeAdapter.OnclickListener() { -- Gitblit v1.8.0