From 134c23aae116f94644d8331c096ff7085e43572b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 16 四月 2025 13:19:51 +0800
Subject: [PATCH] 2025年04月16日13:19:36
---
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
index fb3783c..60f5e71 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
@@ -141,7 +141,6 @@
@Override
public void onClick(View v) {
HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, ConstantManage.station_page, PowerStationStatus.All);
-
}
});
//鏁呴殰
@@ -467,11 +466,14 @@
viewBinding.homePageStationSelectTimeLl.setVisibility(View.VISIBLE);
viewBinding.autoSizeMyAAChart.setBackgroundColor(_mActivity.getColor(R.color.text_FF1C1C1E));
setUpAAChartView(true);//鍥捐〃鍔犺浇
- processLogic();
+ pullToRefresh();
}
- protected void processLogic() {
+ /**
+ * 涓嬫媺鍒锋柊鐨勯�昏緫
+ */
+ protected void pullToRefresh() {
viewBinding.rsl.setDelegate(this);
HDLRefreshViewHolder hdlRefreshViewHolder = new HDLRefreshViewHolder(_mActivity, true);
hdlRefreshViewHolder.setPullDownImageResource(R.mipmap.loading_44);
@@ -609,17 +611,28 @@
HdlThreadLogic.runMainThread(new Runnable() {
@Override
public void run() {
- if (list == null || list.size() == 0) {
+ if (list == null || list.isEmpty()) {
return;
}
String[] keys = new String[list.size()];
Object[] values = new Object[list.size()];
for (int i = 0; i < list.size(); i++) {
- keys[i] = list.get(i).getFieldName();
+ StatisticsBean statisticsBean = list.get(i);
+ keys[i] = statisticsBean.getFieldName();
if (TimeType.day.equals(timeType)) {
- values[i] = HdlCommonLogic.convertBigDecimal(list.get(i).getFieldValue(), 1000);// HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue()).intValue();//鑾峰彇鏁存暟閮ㄥ垎
+ if (statisticsBean.isFuture()) {
+ //鏈潵鏃堕棿涓嶆樉绀�
+ values[i] = null;
+ } else {
+ values[i] = HdlCommonLogic.convertBigDecimal(statisticsBean.getFieldValue(), 1000);// HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue()).intValue();//鑾峰彇鏁存暟閮ㄥ垎
+ }
} else {
- values[i] = HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue());
+ if (statisticsBean.isFuture()) {
+ //鏈潵鏃堕棿涓嶆樉绀�
+ values[i] = null;
+ } else {
+ values[i] = HdlCommonLogic.getBigDecimal(statisticsBean.getFieldValue());
+ }
}
}
fieldNames = keys;
--
Gitblit v1.8.0