2025年08月20日13:31:14

wjc

昨天 59340c0b9107c813d6b3a5c953d693212485ad11

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

@@ -29,6 +29,7 @@
import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.enums.DebugStatus;
import com.hdl.photovoltaic.enums.DebugType;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.enums.PowerStationStatus;
@@ -336,7 +337,8 @@
                        delayedConfirmationCancelDialog.dismiss();
                        if (isWaitDelivered) {
                            showLoading();
                            HdlResidenceLogic.getInstance().setUpdateProjectDebugStatus(houseIdBean.getHomeId(), houseIdBean.getCommunityId(), houseIdBean.getFlowRecordContent(), ProjectOperation.DEBUGGING_AGAIN.toString(), new CloudCallBeak<Boolean>() {
                            String flowRecordContent = UserConfigManage.getInstance().isZh() ? "新特锐能app发起电站重新调试" : "The Xenterra app initiates the re-commissioning of the power station";
                            HdlResidenceLogic.getInstance().setUpdateProjectDebugStatus(houseIdBean.getHomeId(), houseIdBean.getCommunityId(), flowRecordContent, ProjectOperation.DEBUGGING_AGAIN.toString(), new CloudCallBeak<Boolean>() {
                                @Override
                                public void onSuccess(Boolean list) {
                                    hideLoading();
@@ -360,14 +362,14 @@
                                @Override
                                public void onSuccess(List<GatewayBean> list) {
                                    //发起删除电站指令
                                    deleteResidence(houseIdBean.getHomeId(), list, position);
                                    deleteResidence(position, houseIdBean, list);

                                }

                                @Override
                                public void onFailure(HDLException e) {
                                    //发起删除电站指令
                                    deleteResidence(houseIdBean.getHomeId(), null, position);
                                    deleteResidence(position, houseIdBean, null);
                                }
                            });
                        }
@@ -434,6 +436,11 @@
        deviceInfoAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() {
            @Override
            public void onClick(int position, CloudInverterDeviceBean deviceBean) {
//                //杨涛说这个列表不返回未激活的设备，所以去掉判断
//                if (!deviceBean.isActivate()) {
//                    HdlThreadLogic.toast(_mActivity, getString(R.string.device_not_activated));
//                    return;
//                }
//                GatewayBean gatewayBean = new GatewayBean();
//                gatewayBean.setCategorySecondName(deviceBean.getCategorySecondName());
//                gatewayBean.setDevice_mac(deviceBean.getOsn());
@@ -985,19 +992,21 @@
    /**
     * 删除电站
     *
     * @param homeId   电站id
     * @param list     逆变器列表
     * @param position 位置
     * @param position    位置
     * @param houseIdBean 电站id对象
     * @param list        逆变器列表
     */
    private void deleteResidence(String homeId, List<GatewayBean> list, int position) {
    private void deleteResidence(int position, HouseIdBean houseIdBean, List<GatewayBean> list) {

        //删除住宅
        HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() {
        HdlResidenceLogic.getInstance().delResidence(houseIdBean.getHomeId(), new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                hideLoading();
                initializeInverter(list); //发起初始化指令给逆变器;（注意:前面已先解绑云端逆变器，mqtt通道已断开，初始化只能是本地发送(先搜索局域网逆变器列表，建立本地通讯通道)）
                HdlResidenceLogic.getInstance().delHouseId(homeId);//删除电站缓存
                if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) {
                    initializeInverter(list); //发起初始化指令给逆变器;（注意:前面已先解绑云端逆变器，mqtt通道已断开，初始化只能是本地发送(先搜索局域网逆变器列表，建立本地通讯通道)）
                }
                HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId());//删除电站缓存
                initData();//初始化缓存数据
                if (houseInfoAdapter != null) {
//                    houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue);//重新刷新列表