From e0ca0f4d1d079557fbb2367d8ca18f5d75f36235 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 10 四月 2025 15:19:48 +0800 Subject: [PATCH] 2025-04-10 15:19:45 --- app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 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 ed0af8e..4b41efd 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); - } }); //鏁呴殰 @@ -612,17 +611,23 @@ 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()); + values[i] = HdlCommonLogic.getBigDecimal(statisticsBean.getFieldValue()); } } fieldNames = keys; -- Gitblit v1.8.0