~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -289,7 +289,7 @@
			public void onClick(View v) {
			DefaultFilteringDialog defaultFilteringDialog = new DefaultFilteringDialog(_mActivity);
			defaultFilteringDialog.show();
			defaultFilteringDialog.initState(installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus,powerStationTypeValue);
			defaultFilteringDialog.initState(installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationTypeValue);
			defaultFilteringDialog.setOnClickListener(new DefaultFilteringDialog.OnClickListener() {
			@Override
			public void confirm(String min, String max, String state, String powerStationType) {
			@@ -391,7 +391,7 @@
			// if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) {
			//【常规方式】发起删除电站指令（搜索网关是考到网关没有连接到云端，使用本地发送初始化指令）
			// 硬件那边叫新固件也发初始化 2025年10月14日10:55:18
			HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
			HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), houseIdBean.getPowerStationType(), new CloudCallBeak<List<GatewayBean>>() {
			@Override
			public void onSuccess(List<GatewayBean> list) {
			//发起删除电站指令
			@@ -430,7 +430,7 @@
			key = SortType.installedCapacitySort;
			value = isSelected ? SortValue.ascending : SortValue.descending;
			getStatusOverview();
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue,1, true);
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue, 1, true);
			}
			});
			//额定功率筛选
			@@ -442,7 +442,7 @@
			key = SortType.invPowerSort;
			value = isSelected ? SortValue.ascending : SortValue.descending;
			getStatusOverview();
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue,1, true);
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue, 1, true);
			}
			});
			//电站电池容量筛选
			@@ -454,7 +454,7 @@
			key = SortType.batteryCapacitySort;
			value = isSelected ? SortValue.ascending : SortValue.descending;
			getStatusOverview();
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue,1, true);
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue, 1, true);
			}
			});
			//电站当日发电量筛选
			@@ -466,7 +466,7 @@
			key = SortType.todayElectricitySort;
			value = isSelected ? SortValue.ascending : SortValue.descending;
			getStatusOverview();
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue,powerStationTypeValue, 1, true);
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue, 1, true);
			}
			});
			//设备点击
			@@ -503,7 +503,7 @@
			List<CloudInverterDeviceBean> newList = new ArrayList<>();
			newList.add(deviceBean);
			//目的是为了获取拿到网关ID，mqtt通讯秘钥等信息，拿到后缓存到本地逆变器列表里面，发送数据数据时自动去缓存列表里面去查找；
			HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, deviceBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
			HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, deviceBean.getHomeId(), PowerStationType.All, new CloudCallBeak<List<GatewayBean>>() {
			@Override
			public void onSuccess(List<GatewayBean> obj) {

			@@ -724,7 +724,7 @@
			// MqttRecvClient.getInstance().removeAllTopic();
			// }

			loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue,powerStationTypeValue, 1, true);
			loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue, 1, true);
			}
			} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) {
			// 取消粘性事件
			@@ -738,8 +738,8 @@
			}
			String homeId = eventBus.getData().toString();
			//进去住宅详情uni读取逆变器列表成功后通知
			for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId).size(); i++) {
			String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId).get(i).getGatewayId();
			for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId,PowerStationType.All).size(); i++) {
			String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId,PowerStationType.All).get(i).getGatewayId();
			//字符串是自己按规则拼接的,里面注册主题时会解析字符串,只拿getGatewayId()值;
			String topic = "/user/" + gatewayId + "/#";
			//进去住宅详情开始订阅主题
			@@ -767,7 +767,7 @@
			initializationState();
			stationStatusStyle(viewBinding.allLl, viewBinding.allDesTv);
			getStatusOverview();
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue,powerStationTypeValue, 1, true);
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue, 1, true);
			} else if (eventBus.getType().equals(ConstantManage.station_page)) {
			// 取消粘性事件
			EventBus.getDefault().removeStickyEvent(eventBus);
			@@ -785,7 +785,7 @@
			stationStatusStyle(viewBinding.connectedLl, viewBinding.connectedDesTv);
			}
			getStatusOverview();
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue,powerStationTypeValue, 1, true);
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue, 1, true);
			} else if (eventBus.getType().equals(ConstantManage.station_edit)) {
			//编辑后更新一下住宅列表
			//loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
			@@ -804,7 +804,7 @@
			* 电站状态概览
			*/
			private void getStatusOverview() {
			HdlResidenceLogic.getInstance().getStatusOverview(screeningConditionStatus, installedCapacityMinValue, installedCapacityMaxValue,powerStationTypeValue, new CloudCallBeak<StatusOverviewBean>() {
			HdlResidenceLogic.getInstance().getStatusOverview(screeningConditionStatus, installedCapacityMinValue, installedCapacityMaxValue, powerStationTypeValue, new CloudCallBeak<StatusOverviewBean>() {
			@Override
			public void onSuccess(StatusOverviewBean statusOverviewBean) {
			if (statusOverviewBean == null) {
			@@ -1196,7 +1196,7 @@
			// 执行任务（如更新UI、跳转等）
			viewBinding.fragmentHouseSrl.endRefreshing();
			//加载最新数据完成
			loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue,1, true);
			loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue, 1, true);
			getStatusOverview();
			}
			}.execute();
			@@ -1223,7 +1223,7 @@
			viewBinding.fragmentHouseSrl.endLoadingMore();
			if (!isHouseLoadingMore) {
			// 滑动到了底部，执行相应的操作
			loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue,powerStationTypeValue, ++currentHouseListPage, false);
			loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, powerStationTypeValue, ++currentHouseListPage, false);
			}
			}
			}.execute();