From fa1a77e3f95e5789c01a6dd542ac24e53b9515af Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 22 六月 2024 09:14:54 +0800
Subject: [PATCH] 2024年06月22日09:14:46
---
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 ad73e1b..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;
@@ -336,6 +337,7 @@
* 鏃堕棿閫夋嫨鍣�
*/
private void selectedTimePickerBuilder() {
+
String currDate = viewBinding.yearMonthDayTv.getText().toString();
//鏃堕棿閫夋嫨鍣�
Calendar selectedDate = TimeUtils.stringToCalendar(currDate, TimeUtils.getTimeDateFormat(timeType));
@@ -415,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);
@@ -467,7 +469,6 @@
// 鍙栨秷绮樻�т簨浠�
EventBus.getDefault().removeStickyEvent(eventBus);
HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愰椤点��");
-
}
}
}
@@ -512,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()));
--
Gitblit v1.8.0