From 7fdae87bc3de46b5b012f8987c6902cd8b054323 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 16 五月 2024 18:17:11 +0800
Subject: [PATCH] 2024年05月16日18:17:09
---
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 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 0b72e9d..c048c81 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
@@ -29,11 +29,15 @@
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlPowerStationDataStatisticsLogic;
+import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.DataOverBean;
import com.hdl.photovoltaic.ui.bean.SocialContributionBean;
import com.hdl.photovoltaic.ui.bean.StatisticsBean;
+import com.hdl.photovoltaic.ui.bean.StatusOverviewBean;
import com.hdl.photovoltaic.ui.home.aachart.BasicChartComposer;
+import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.TimeUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -91,6 +95,7 @@
HdlThreadLogic.runSubThread(new Runnable() {
@Override
public void run() {
+ getStatusOverview();
getDataOver();
getStatistics();
getSocialContribution();
@@ -100,6 +105,13 @@
}
private void initEvent() {
+ //鐢电珯娣诲姞
+ viewBinding.homePageStationAddIv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+ }
+ });
//鏃堕棿閫夋嫨鍣�
viewBinding.yearMonthDayTv.setOnClickListener(new View.OnClickListener() {
@Override
@@ -356,6 +368,12 @@
private void initView() {
+
+ viewBinding.homeAllIl.stationTitleTv.setText(getString(R.string.message_all));
+ viewBinding.homeFaultsIl.stationTitleTv.setText(getString(R.string.my_power_station_malfunction));
+ viewBinding.homeOfflineIl.stationTitleTv.setText(getString(R.string.my_power_station_off_line));
+ viewBinding.homeConnectedIl.stationTitleTv.setText(getString(R.string.to_be_added));
+
String dataStr = TimeUtils.getDateTimestamp(getCurrentTimestamp(), getTimeDateFormat());
viewBinding.yearMonthDayTv.setText(dataStr);
@@ -363,7 +381,7 @@
viewBinding.infoRl1Text2Tv.setText(installed_capacity);
String generated_power = getString(R.string.generated_power) + "(" + HdlDeviceLogic.kW + ")";
viewBinding.infoRl1Text4Tv.setText(generated_power);
- String generation = getString(R.string.generation) + "(" + HdlDeviceLogic.kWp + ")";
+ String generation = getString(R.string.generation) + "(" + HdlDeviceLogic.kWh + ")";
viewBinding.homePageStationInfoRl1TitleTv.setText(generation);
viewBinding.homePageStationInfoRl2DayIc.dataTypeTv.setText(R.string.day_power_generation);
@@ -416,6 +434,29 @@
}
}
+ /**
+ * 鐢电珯鐘舵�佹瑙�
+ */
+ private void getStatusOverview() {
+ HdlResidenceLogic.getInstance().getStatusOverview(new CloudCallBeak<StatusOverviewBean>() {
+ @Override
+ public void onSuccess(StatusOverviewBean statusOverviewBean) {
+ if (statusOverviewBean == null) {
+ return;
+ }
+ viewBinding.homeAllIl.stationTotalTv.setText(statusOverviewBean.getTotal() + "");
+ viewBinding.homeFaultsIl.stationTotalTv.setText(statusOverviewBean.getFault() + "");
+ viewBinding.homeOfflineIl.stationTotalTv.setText(statusOverviewBean.getOffline() + "");
+ viewBinding.homeConnectedIl.stationTotalTv.setText(statusOverviewBean.getConnecting() + "");
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+
+ }
+ });
+ }
+
/**
* 鑾峰彇缁熻姒傝鏁版嵁(鍏徃缁村害)
@@ -424,17 +465,22 @@
HdlPowerStationDataStatisticsLogic.getInstance().getDataOver(new CloudCallBeak<DataOverBean>() {
@Override
public void onSuccess(DataOverBean dataOverBean) {
- if (dataOverBean == null) {
- return;
- }
- viewBinding.infoRl1Text1Tv.setText(dataOverBean.getInstalledCapacity());
- viewBinding.infoRl1Text3Tv.setText(dataOverBean.getPower());
- viewBinding.infoRl1FText1Tv.setText(dataOverBean.getPowerRatio());
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ if (dataOverBean == null) {
+ return;
+ }
+ viewBinding.infoRl1Text1Tv.setText(HdlDeviceLogic.getConvertDoubleUnit(dataOverBean.getInstalledCapacity()));
+ viewBinding.infoRl1Text3Tv.setText(HdlDeviceLogic.getConvertDoubleUnit(dataOverBean.getPower()));
+ viewBinding.infoRl1FText1Tv.setText(dataOverBean.getPowerRatio());
- viewBinding.homePageStationInfoRl2DayIc.dataTv.setText(dataOverBean.getTodayElectricity());
- viewBinding.homePageStationInfoRl2MonIc.dataTv.setText(dataOverBean.getMonthElectricity());
- viewBinding.homePageStationInfoRl2YearIc.dataTv.setText(dataOverBean.getYearElectricity());
- viewBinding.homePageStationInfoRl2CumulativeIc.dataTv.setText(dataOverBean.getTotalElectricity());
+ viewBinding.homePageStationInfoRl2DayIc.dataTv.setText(HdlDeviceLogic.getConvertDoubleUnit(dataOverBean.getTodayElectricity()));
+ viewBinding.homePageStationInfoRl2MonIc.dataTv.setText(HdlDeviceLogic.getConvertDoubleUnit(dataOverBean.getMonthElectricity()));
+ viewBinding.homePageStationInfoRl2YearIc.dataTv.setText(HdlDeviceLogic.getConvertDoubleUnit(dataOverBean.getYearElectricity()));
+ viewBinding.homePageStationInfoRl2CumulativeIc.dataTv.setText(HdlDeviceLogic.getConvertDoubleUnit(dataOverBean.getTotalElectricity()));
+ }
+ });
}
@Override
@@ -474,7 +520,7 @@
}
/**
- * 鍙戠數閲忕粺璁�(鍏徃缁村害)
+ * 绀句細璐＄尞(鍏徃缁村害)
*/
private void getSocialContribution() {
HdlPowerStationDataStatisticsLogic.getInstance().getSocialContribution(new CloudCallBeak<SocialContributionBean>() {
--
Gitblit v1.8.0