From a91da1a664d0036c1d7f126a11b397e4239f257d Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 05 三月 2025 16:51:07 +0800
Subject: [PATCH] 2025年03月05日16:51:04
---
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java | 30 ++++++++++-----
app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java | 4 ++
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 38 +++++++++---------
app/src/main/res/layout/dialog_default_filtering.xml | 6 +-
4 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
index 37a582a..31406e1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
@@ -61,6 +61,10 @@
|| joinFileName.equals(FileName.hdl_inv_ecu_info_output + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV)
|| joinFileName.equals(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV)
|| joinFileName.equals(FileName.hdl_inv_ecu_info_signal + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.INV)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_pv + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_output + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV)
+ || joinFileName.equals(FileName.hdl_inv_ecu_info_signal + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV)
) {
return address + "/" + UserConfigManage.getInstance().getCurrentAppLanguage() + "/" + deviceType + "/" + deviceModel + "/info/" + fileName + this.getVersion(joinFileName) + ".json";
}
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 ec9501d..9feca3b 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
@@ -103,7 +103,7 @@
private String value = SortValue.all;//descending:闄嶅簭,ascending:鍗囧簭
private String installedCapacityMinValue = "";//鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
private String installedCapacityMaxValue = "";//鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
- private String debugStatus = DebugStatus.All;//绛涢�夋潯浠剁姸鎬�
+ private String screeningConditionStatus = DebugStatus.All;//绛涢�夋潯浠剁姸鎬�
private String powerStationStatusValue = PowerStationStatus.All;//鐢电珯鐘舵��(鍏ㄩ儴 涓嶄紶璇ヨ繃婊ゅ弬鏁�,1:姝ｅ父(杩愯),2:绂荤嚎,3:寰呮帴鍏�,4:鏁呴殰)
private final long pageSize = 20;//椤垫暟
@@ -116,7 +116,7 @@
value = SortValue.all;
installedCapacityMinValue = "";
installedCapacityMaxValue = "";
- debugStatus = DebugStatus.All;
+ screeningConditionStatus = DebugStatus.All;
powerStationStatusValue = PowerStationStatus.All;
}
@@ -149,7 +149,7 @@
selectedTitleLabelStyle();
initializationState();
getStatusOverview();
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
@@ -174,7 +174,7 @@
viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
//鏁呴殰
@@ -186,7 +186,7 @@
viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
//绂荤嚎
@@ -198,7 +198,7 @@
viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
//寰呮帴鍏�
@@ -210,7 +210,7 @@
viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
@@ -244,14 +244,14 @@
public void onClick(View v) {
DefaultFilteringDialog defaultFilteringDialog = new DefaultFilteringDialog(_mActivity);
defaultFilteringDialog.show();
- defaultFilteringDialog.initState(installedCapacityMinValue, installedCapacityMaxValue, debugStatus);
+ defaultFilteringDialog.initState(installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus);
defaultFilteringDialog.setOnClickListener(new DefaultFilteringDialog.OnClickListener() {
@Override
public void confirm(String min, String max, String state) {
installedCapacityMinValue = min;//鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
installedCapacityMaxValue = max;//鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
- debugStatus = state;//璋冭瘯鐘舵��(鍏ㄩ儴;璋冭瘯涓�;璋冭瘯瀹屾垚;宸蹭氦浠�;鎺堟潈璋冭瘯)
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ screeningConditionStatus = state;//璋冭瘯鐘舵��(鍏ㄩ儴;璋冭瘯涓�;璋冭瘯瀹屾垚;宸蹭氦浠�;鎺堟潈璋冭瘯)
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
}
@@ -264,7 +264,7 @@
@Override
public void onRefresh() {
viewBinding.fragmentHouseSrl.setRefreshing(false);
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
getStatusOverview();
}
});
@@ -285,7 +285,7 @@
if (!isHouseLoadingMore) {
// 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
HdlLogLogic.print("---婊戝姩鍒颁簡搴曢儴");
- loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, ++currentHouseListPage, false);
+ loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, ++currentHouseListPage, false);
}
}
}
@@ -402,7 +402,7 @@
screenIconState(viewBinding.stationNameRl, viewBinding.stationNameIv, isSelected);
key = SortType.homeNameSort;
value = isSelected ? SortValue.ascending : SortValue.descending;
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
//鐢电珯鍙戠數鍔熺巼绛涢��
@@ -413,7 +413,7 @@
screenIconState(viewBinding.stationPowerRl, viewBinding.stationPowerIv, isSelected);
key = SortType.powerSort;
value = isSelected ? SortValue.ascending : SortValue.descending;
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
//鐢电珯褰撴棩鍙戠數閲忕瓫閫�
@@ -424,7 +424,7 @@
screenIconState(viewBinding.stationDayRl, viewBinding.stationDayIv, isSelected);
key = SortType.todayElectricitySort;
value = isSelected ? SortValue.ascending : SortValue.descending;
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
//鐢电珯鐢垫睜瀹归噺绛涢��
@@ -435,7 +435,7 @@
screenIconState(viewBinding.stationMonthRl, viewBinding.stationMonthIv, isSelected);
key = SortType.batteryCapacitySort;
value = isSelected ? SortValue.ascending : SortValue.descending;
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
//璁惧鐐瑰嚮
@@ -621,7 +621,7 @@
// 鍙栨秷绮樻�т簨浠�
EventBus.getDefault().removeStickyEvent(eventBus);
//uin鍒涘缓鐢电珯鎴愬姛鍚庨�氱煡
- loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
if (eventBus.getData() != null) {
Gson gson = new Gson();
String json = eventBus.getData().toString();
@@ -665,7 +665,7 @@
// if (MqttRecvClient.getInstance() != null) {
// MqttRecvClient.getInstance().removeAllTopic();
// }
- loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) {
// 鍙栨秷绮樻�т簨浠�
@@ -707,7 +707,7 @@
selectedTitleLabelStyle();
initializationState();
getStatusOverview();
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, debugStatus, powerStationStatusValue, 1, true);
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
} else if (eventBus.getType().equals(ConstantManage.station_page)) {
//閫氳繃棣栭〉鐢电珯杩涙潵鐨�
if (eventBus.getData().equals(PowerStationStatus.All)) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
index 77e8617..6dc1b55 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -315,16 +315,26 @@
break;
}
}
- if (TextUtils.isEmpty(DebugStatus.All)) {
- setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
- } else if (stateValue.equals(DebugStatus.Debugging)) {
- setBackgroundColor(viewBinding.beDebuggingTv, TitleType.debuggingState);
- } else if (stateValue.equals(DebugStatus.WAIT_DELIVERED)) {
- setBackgroundColor(viewBinding.debuggingcOmpletedTv, TitleType.debuggingState);
- } else if (stateValue.equals(DebugStatus.Delivered)) {
- setBackgroundColor(viewBinding.deliveredTv, TitleType.debuggingState);
- } else if (stateValue.equals(DebugStatus.SECONDARY_DEBUGGIN)) {
- setBackgroundColor(viewBinding.authorizationDebuggingTv, TitleType.debuggingState);
+ switch (stateValue) {
+ case DebugStatus.All:
+ setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
+ break;
+ case DebugStatus.Debugging:
+ setBackgroundColor(viewBinding.beDebuggingTv, TitleType.debuggingState);
+ break;
+ case DebugStatus.WAIT_DELIVERED:
+ setBackgroundColor(viewBinding.debuggingcOmpletedTv, TitleType.debuggingState);
+ break;
+ case DebugStatus.Delivered:
+ setBackgroundColor(viewBinding.deliveredTv, TitleType.debuggingState);
+ break;
+ case DebugStatus.SECONDARY_DEBUGGIN:
+ setBackgroundColor(viewBinding.authorizationDebuggingTv, TitleType.debuggingState);
+ break;
+ default: {
+ setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
+ break;
+ }
}
} catch (Exception ignored) {
}
diff --git a/app/src/main/res/layout/dialog_default_filtering.xml b/app/src/main/res/layout/dialog_default_filtering.xml
index 7583211..9288dfe 100644
--- a/app/src/main/res/layout/dialog_default_filtering.xml
+++ b/app/src/main/res/layout/dialog_default_filtering.xml
@@ -284,7 +284,7 @@
android:id="@+id/be_debugging_tv"
android:layout_width="102dp"
android:layout_height="@dimen/dp_35"
- android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="13dp"
android:background="@drawable/config_129"
android:gravity="center"
@@ -298,7 +298,7 @@
android:id="@+id/debuggingc_ompleted_tv"
android:layout_width="102dp"
android:layout_height="@dimen/dp_35"
- android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="13dp"
android:background="@drawable/config_129"
android:gravity="center"
@@ -326,7 +326,7 @@
android:id="@+id/authorization_debugging_tv"
android:layout_width="102dp"
android:layout_height="@dimen/dp_35"
- android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="13dp"
android:background="@drawable/config_129"
android:gravity="center"
--
Gitblit v1.8.0