From c7eeb5c6bc5d1cba44e92761d4be67f97f7c23aa Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 05 六月 2024 16:38:30 +0800
Subject: [PATCH] 2024年06月05日16:38:23
---
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 aee1ac9..ebc8306 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
@@ -4,6 +4,7 @@
import static com.hdl.photovoltaic.ui.home.aachart.CustomStyleChartComposer.configureColorfulColumnChart;
import android.os.Bundle;
+import android.os.SystemClock;
import android.text.TextUtils;
import android.view.View;
@@ -28,6 +29,7 @@
import com.hdl.photovoltaic.enums.UnitType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
+import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlPowerStationDataStatisticsLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
@@ -79,7 +81,6 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- LReceiveAndSend.Start(_mActivity);
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -160,7 +161,8 @@
return;
}
timeType = TimeType.day;
-
+ viewBinding.unitTv.setText(UnitType.kW);
+ viewBinding.unitTextTv.setText(getString(R.string.pv_power));
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494));
viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_38C494));
@@ -193,6 +195,8 @@
return;
}
timeType = TimeType.month;
+ viewBinding.unitTv.setText(UnitType.kWh);
+ viewBinding.unitTextTv.setText(getString(R.string.generation));
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
@@ -225,6 +229,8 @@
return;
}
timeType = TimeType.year;
+ viewBinding.unitTv.setText(UnitType.kWh);
+ viewBinding.unitTextTv.setText(getString(R.string.generation));
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
@@ -255,6 +261,8 @@
return;
}
timeType = TimeType.all;
+ viewBinding.unitTv.setText(UnitType.kWh);
+ viewBinding.unitTextTv.setText(getString(R.string.generation));
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000));
@@ -329,6 +337,7 @@
* 鏃堕棿閫夋嫨鍣�
*/
private void selectedTimePickerBuilder() {
+
String currDate = viewBinding.yearMonthDayTv.getText().toString();
//鏃堕棿閫夋嫨鍣�
Calendar selectedDate = TimeUtils.stringToCalendar(currDate, TimeUtils.getTimeDateFormat(timeType));
@@ -391,7 +400,7 @@
if (TimeType.day.equals(timeType)) {
aaChartModel = BasicChartComposer.configureAreaChart(getString(R.string.pv_power), fieldNames, fieldValues);
} else if (TimeType.month.equals(timeType) || TimeType.year.equals(timeType) || TimeType.all.equals(timeType)) {
- aaChartModel = configureColorfulColumnChart(getString(R.string.pv_power), fieldNames, fieldValues);
+ aaChartModel = configureColorfulColumnChart(getString(R.string.generation), fieldNames, fieldValues);
}
aaChartView.aa_drawChartWithChartModel(aaChartModel);
@@ -408,7 +417,7 @@
String dataStr = TimeUtils.getDateTimestamp(TimeUtils.getCurrentTimestamp(), TimeUtils.getTimeDateFormat(timeType));
viewBinding.yearMonthDayTv.setText(dataStr);
- String installed_capacity = getString(R.string.installed_capacity) + "(" + UnitType.kWp + ")";
+ String installed_capacity = getString(R.string.string_capacity) + "(" + UnitType.kWp + ")";
viewBinding.infoRl1Text2Tv.setText(installed_capacity);
String generated_power = getString(R.string.generated_power) + "(" + UnitType.kW + ")";
viewBinding.infoRl1Text4Tv.setText(generated_power);
@@ -460,7 +469,6 @@
// 鍙栨秷绮樻�т簨浠�
EventBus.getDefault().removeStickyEvent(eventBus);
HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愰椤点��");
-
}
}
}
@@ -505,7 +513,7 @@
return;
}
viewBinding.infoRl1Text1Tv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getInstalledCapacity()));
- viewBinding.infoRl1Text3Tv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getPower()));
+ viewBinding.infoRl1Text3Tv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getPower(), UnitType.kW, false));
viewBinding.infoRl1FText1Tv.setText(dataOverBean.getPowerRatio());
viewBinding.homePageStationInfoRl2DayIc.dataTv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getTodayElectricity()));
@@ -541,7 +549,11 @@
Object[] values = new Object[list.size()];
for (int i = 0; i < list.size(); i++) {
keys[i] = list.get(i).getFieldName();
- values[i] = HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue()).intValue();//鑾峰彇鏁存暟閮ㄥ垎
+ if (TimeType.day.equals(timeType)) {
+ values[i] = HdlCommonLogic.divideByOneThousandAndFormat(list.get(i).getFieldValue());// HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue()).intValue();//鑾峰彇鏁存暟閮ㄥ垎
+ } else {
+ values[i] = HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue());
+ }
}
fieldNames = keys;
fieldValues = values;
@@ -570,7 +582,7 @@
}
viewBinding.socialContributionData1Tv.setText(HdlCommonLogic.convertString(HdlCommonLogic.getBigDecimal(socialContributionBean.getCoal())));
viewBinding.socialContributionData2Tv.setText(HdlCommonLogic.convertString(HdlCommonLogic.getBigDecimal(socialContributionBean.getCo2())));
- viewBinding.socialContributionData3Tv.setText(HdlCommonLogic.convertString(HdlCommonLogic.getBigDecimal(socialContributionBean.getTreePlanting())));
+ viewBinding.socialContributionData3Tv.setText(HdlCommonLogic.convertString(socialContributionBean.getTreePlanting()));
}
@Override
--
Gitblit v1.8.0