Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

 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,16 +65,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 +96,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();
            }
        });

@@ -126,7 +140,7 @@
                }
            });

            //电站移动位置按钮
            //电站删除位置按钮
            houseListAdapter.setDelOnclickListener(new HouseListAdapter.OnDelClickListener() {
                @Override
                public void onDelClick(int position, HouseIdBean houseIdBean) {
@@ -197,6 +211,7 @@
        this.nullDataUpdateUi(houseListBeanIDList);
    }


    /**
     * 删除电站,逆变器
     * (开始删除电站，同时，向逆变器发送初始化逆变器指令,无须处理结果)
@@ -209,7 +224,7 @@
        }
        for (int i = 0; i < list.size(); i++) {
            GatewayBean gatewayBean = list.get(i);
            HdlDeviceLogic.getInstance().initializeGateway(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
            HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
                @Override
                public void onSuccess(Boolean obj) {
//                                HdlLogLogic.print("初始化逆变器成功-->mac:" + cloudInverterDeviceBean.getOsn(),true);
@@ -254,6 +269,9 @@
     * @param isRefreshing 表示是下拉刷新的
     */
    private void downReadData(boolean isRefreshing) {
        if (!isRefreshing) {
            showLoading();
        }
        //获取住宅(电站)ID列表
        HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
            @Override
@@ -264,6 +282,8 @@
                        if (isRefreshing) {
                            //关闭下拉刷新的圈圈
                            viewBinding.fragmentHouseSrl.setRefreshing(false);
                        } else {
                            hideLoading();
                        }
                        if (list != null && list.size() > 0) {
                            //更新缓存
@@ -290,7 +310,10 @@
                        if (isRefreshing) {
                            //关闭下拉刷新的圈圈
                            viewBinding.fragmentHouseSrl.setRefreshing(false);
                        } else {
                            hideLoading();
                        }


                    }
                }, _mActivity, ShowErrorMode.YES);
@@ -309,6 +332,7 @@
        }
    }


    /**
     * 没有电站列表的样式
     */