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;
@@ -27,8 +29,11 @@
import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
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;
@@ -41,7 +46,7 @@
    private ActivityHouseListEditBinding viewBinding;

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


    @Override
@@ -60,28 +65,38 @@
        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() {
        //返回按钮
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        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();
            }
        });

@@ -99,10 +114,13 @@
            houseListAdapter.setMoveOnclickListener(new HouseListAdapter.OnMoveClickListener() {
                @Override
                public void onMoveClick(int position, HouseIdBean houseIdBean) {

                    if (position == 0) {
                        HdlThreadLogic.toast(_mActivity, getString(R.string.already_the_first_one));
                        return;
                    }
                    String frontHomeId = "";
                    if (position > 0) {
                        frontHomeId = houseListBeanIDList.get(position - 1).getHomeId();
                    if (position > 1) {
                        frontHomeId = houseListBeanIDList.get(position - 2).getHomeId();
                    }
                    HdlResidenceLogic.getInstance().moveResidence(houseIdBean.getHomeId(), frontHomeId, new CloudCallBeak<Boolean>() {
                        @Override
@@ -122,7 +140,7 @@
                }
            });

            //电站移动位置按钮
            //电站删除位置按钮
            houseListAdapter.setDelOnclickListener(new HouseListAdapter.OnDelClickListener() {
                @Override
                public void onDelClick(int position, HouseIdBean houseIdBean) {
@@ -132,12 +150,24 @@
                    String homeName = "\"" + houseIdBean.getHomeName() + "\"";
                    delayedConfirmationCancelDialog.setContent(getString(R.string.delete_power_station).replace("%s", homeName));
                    delayedConfirmationCancelDialog.show();
                    delayedConfirmationCancelDialog.startCountdown(3);
                    delayedConfirmationCancelDialog.startCountdown(4);
                    delayedConfirmationCancelDialog.setYesOnclickListener(new DelayedConfirmationCancelDialog.onYesOnclickListener() {
                        @Override
                        public void Confirm() {
                            delayedConfirmationCancelDialog.dismiss();
                            delete(houseIdBean.getHomeId());
                            showLoading(getString(R.string.deleting_please_wait));
                            HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
                                @Override
                                public void onSuccess(List<GatewayBean> list) {
                                    deleteResidence(houseIdBean.getHomeId());
                                    initializeInverter(list);
                                }

                                @Override
                                public void onFailure(HDLException e) {
                                    deleteResidence(houseIdBean.getHomeId());
                                }
                            });
//                            //删除住宅
//                            HdlResidenceLogic.getInstance().delResidence(houseIdBean.getHomeId(), new CloudCallBeak<Boolean>() {
//                                @Override
@@ -170,7 +200,7 @@

    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.power_station_editing);
        LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
@@ -181,40 +211,31 @@
        this.nullDataUpdateUi(houseListBeanIDList);
    }


    /**
     * 删除电站,逆变器
     * (先获取云端上逆变器列表,开始删除电站，同时，向逆变器发送初始化逆变器指令)
     * (开始删除电站，同时，向逆变器发送初始化逆变器指令,无须处理结果)
     *
     * @param homeId 电站id
     * @param list 设备列表
     */
    private void delete(String homeId) {
        HdlDeviceLogic.getInstance().getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
            @Override
            public void onSuccess(List<CloudInverterDeviceBean> list) {
                deleteResidence(homeId);
                if (list != null) {
                    for (int i = 0; i < list.size(); i++) {
                        CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
                        HdlDeviceLogic.getInstance().initializeGateway(cloudInverterDeviceBean.getOsn(), new LinkCallBack<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {

                            }

                            @Override
                            public void onError(HDLLinkException e) {

                            }
                        });
                    }
    private void initializeInverter(List<GatewayBean> list) {
        if (list == null || list.size() == 0) {
            return;
        }
        for (int i = 0; i < list.size(); i++) {
            GatewayBean gatewayBean = list.get(i);
            HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
                @Override
                public void onSuccess(Boolean obj) {
//                                HdlLogLogic.print("初始化逆变器成功-->mac:" + cloudInverterDeviceBean.getOsn(),true);
                }
            }

            @Override
            public void onFailure(HDLException e) {
                deleteResidence(homeId);
            }
        });
                @Override
                public void onError(HDLLinkException e) {
//                                HdlLogLogic.print("初始化逆变器失败-->mac:" + cloudInverterDeviceBean.getOsn(),true);
                }
            });
        }
    }

    /**
@@ -227,6 +248,7 @@
        HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                hideLoading();
                HdlResidenceLogic.getInstance().delHouseId(homeId);
                initData();//初始化缓存数据
                houseListAdapter.setList(houseListBeanIDList);//重新刷新列表
@@ -235,6 +257,7 @@

            @Override
            public void onFailure(HDLException e) {
                hideLoading();
                HdlThreadLogic.toast(_mActivity, e);
            }
        });
@@ -246,6 +269,9 @@
     * @param isRefreshing 表示是下拉刷新的
     */
    private void downReadData(boolean isRefreshing) {
        if (!isRefreshing) {
            showLoading();
        }
        //获取住宅(电站)ID列表
        HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
            @Override
@@ -256,6 +282,8 @@
                        if (isRefreshing) {
                            //关闭下拉刷新的圈圈
                            viewBinding.fragmentHouseSrl.setRefreshing(false);
                        } else {
                            hideLoading();
                        }
                        if (list != null && list.size() > 0) {
                            //更新缓存
@@ -282,7 +310,10 @@
                        if (isRefreshing) {
                            //关闭下拉刷新的圈圈
                            viewBinding.fragmentHouseSrl.setRefreshing(false);
                        } else {
                            hideLoading();
                        }


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


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