From 24a59bc611c38ec3c01987cd5bb33984aa9731b2 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 24 六月 2024 16:48:51 +0800
Subject: [PATCH] 2024年06月24日16:48:45
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
index 00244ba..3c5872b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -91,6 +91,17 @@
private final long pageSize = 20;//椤垫暟
+ /**
+ * 杩樺師鏉′欢鐨勫垵濮嬪寲鐘舵��
+ */
+ private void InitializationState() {
+ key = SortValue.all;
+ value = SortValue.all;
+ installedCapacityMinValue = "";
+ installedCapacityMaxValue = "";
+ gridTypeValue = "";
+ powerStationStatusValue = PowerStationStatus.All;
+ }
@Override
public Object getContentView() {
@@ -119,6 +130,7 @@
}
isClickPowerStationLabel = true;
selectedTitleLabelStyle();
+ InitializationState();
getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
@@ -633,7 +645,7 @@
} else if (HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE.equals(eventBus.getTopic())) {
// 鍙栨秷绮樻�т簨浠�
EventBus.getDefault().removeStickyEvent(eventBus);
- //鏄湪鐢电珯鍒楄〃椤垫墠杩涙潵杩欓噷
+ //鏄湪锛堢數绔欙級妯″潡涓斿湪锛堢數绔欙級鏍囩椤垫墠杩涙潵杩欓噷
if (HdlCommonLogic.lowerTagType == LowerTagType.power_station && isClickPowerStationLabel) {
//uin鍏抽棴浣忓畢璇︽儏鐣岄潰閫氱煡
if (MqttRecvClient.getInstance() != null) {
@@ -661,12 +673,17 @@
// 鍙栨秷绮樻�т簨浠�
EventBus.getDefault().removeStickyEvent(eventBus);
HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愮數绔欍��");
- if (!isReadData) {
- //1锛屼粠棣栭〉-鏁呴殰-杩涙潵-鐢电珯锛堜笉璇诲彇锛�
- //2锛屼粠鐢电珯-杩涙潵-鐢电珯锛堣鍙栦竴娆�,鍚庨潰杩涙潵涓嶅湪璇诲彇锛�
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
- getStatusOverview();
- }
+// if (!isReadData) {
+// //1锛屼粠棣栭〉-鏁呴殰-杩涙潵-鐢电珯锛堜笉璇诲彇锛�
+// //2锛屼粠鐢电珯-杩涙潵-鐢电珯锛堣鍙栦竴娆�,鍚庨潰杩涙潵涓嶅湪璇诲彇锛�
+// loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
+// getStatusOverview();
+// }
+ //2024骞�06鏈�24鏃�14:34:01 浜у搧缁忕悊瑕佹眰杩涘幓鐢电珯鍒楄〃閮借璇诲彇
+ InitializationState();
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
+ getStatusOverview();
+
} else if (eventBus.getType().equals(PowerStationStatus.All)) {
isClickPowerStationLabel = true;
selectedTitleLabelStyle();
--
Gitblit v1.8.0