Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java

@@ -42,7 +42,7 @@
    private ActivityHouseListEditBinding viewBinding;

    private HouseListAdapter houseListAdapter;
    private List<HouseIdBean> houseListBeanIDList;
    private List<HouseIdBean> houseListBeanIDList = new ArrayList<>();


    @Override
@@ -61,16 +61,30 @@
        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() {
        super.onBackPressed();
        sendEventBus();
    }

    private void sendEventBus() {
        HdlCommonLogic.getInstance().postEventBus(ConstantManage.homepage_title_tab_switch, ConstantManage.station_edit);
        finish();
    }

    private void initEvent() {
@@ -78,11 +92,7 @@
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                BaseEventBus baseEventBus = new BaseEventBus();
                baseEventBus.setTopic(ConstantManage.homepage_title_tab_switch);
                baseEventBus.setType(HomepageTitleTabSwitch.powerstation.toString());
                EventBus.getDefault().post(baseEventBus);
                finish();
                sendEventBus();
            }
        });

@@ -254,6 +264,9 @@
     * @param isRefreshing 表示是下拉刷新的
     */
    private void downReadData(boolean isRefreshing) {
        if (!isRefreshing) {
            showLoading();
        }
        //获取住宅(电站)ID列表
        HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
            @Override
@@ -264,6 +277,8 @@
                        if (isRefreshing) {
                            //关闭下拉刷新的圈圈
                            viewBinding.fragmentHouseSrl.setRefreshing(false);
                        } else {
                            hideLoading();
                        }
                        if (list != null && list.size() > 0) {
                            //更新缓存
@@ -290,8 +305,11 @@
                        if (isRefreshing) {
                            //关闭下拉刷新的圈圈
                            viewBinding.fragmentHouseSrl.setRefreshing(false);
                        } else {
                            hideLoading();
                        }


                    }
                }, _mActivity, ShowErrorMode.YES);
            }