2025年08月26日17:30:41

wjc

12 小时以前 cf761dbce02ea1da7682265853354ca74dc2c31f

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

@@ -358,20 +358,26 @@
                            });
                        } else {
                            showLoading(getString(R.string.deleting_please_wait));
                            HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
                                @Override
                                public void onSuccess(List<GatewayBean> list) {
                                    //发起删除电站指令
                                    deleteResidence(position, houseIdBean, list);
                            if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) {
                                //【常规方式】发起删除电站指令
                                HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
                                    @Override
                                    public void onSuccess(List<GatewayBean> list) {
                                        //发起删除电站指令
                                        deleteResidence(position, houseIdBean, list);

                                }
                                    }

                                @Override
                                public void onFailure(HDLException e) {
                                    //发起删除电站指令
                                    deleteResidence(position, houseIdBean, null);
                                }
                            });
                                    @Override
                                    public void onFailure(HDLException e) {
                                        //发起删除电站指令
                                        deleteResidence(position, houseIdBean, null);
                                    }
                                });
                            } else {
                                //【简易方式】发起删除电站指令
                                deleteResidence(position, houseIdBean, null);
                            }
                        }
                    }
                });
@@ -436,10 +442,12 @@
        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;
                }
                deviceBean.setActivate(true);//默认激活
//                //杨涛说这个列表不返回未激活的设备，所以去掉判断
//                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());
@@ -871,7 +879,7 @@
        if (isRefreshing) {
            showLoading(getString(R.string.device_loading));
        }
        //获取住宅(电站)ID列表
        //获取设备列表
        HdlDeviceLogic.getInstance().getPowerStationDeviceList("", pageNo, pageSize, new CloudCallBeak<PageNumberObject<CloudInverterDeviceBean>>() {
            @Override
            public void onSuccess(PageNumberObject<CloudInverterDeviceBean> pageNumberObject) {
@@ -1008,8 +1016,8 @@
                HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId());//删除电站缓存
                initData();//初始化缓存数据
                if (houseInfoAdapter != null) {
//                    houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue);//重新刷新列表
                    houseInfoAdapter.notifyItemRemoved(position);//只刷新当前的位置
                    houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue);//重新刷新列表
//                    houseInfoAdapter.notifyItemRemoved(position);//只刷新当前的位置
                }
                getStatusOverview();//删除成功后刷新电站状态概览
                nullDataUpdateUi();//检测数据是否为空