From 562ea59026c221ba2499c8b5cf70e838e44005dd Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 20 五月 2024 18:49:11 +0800 Subject: [PATCH] 2024年05月20日18:49:00 --- app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 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 6f08954..8d64c1b 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 @@ -25,6 +25,7 @@ import com.hdl.photovoltaic.databinding.FragmentHomePageBinding; import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch; import com.hdl.photovoltaic.enums.TimeType; +import com.hdl.photovoltaic.enums.UnitType; import com.hdl.photovoltaic.listener.CloudCallBeak; import com.hdl.photovoltaic.other.HdlCommonLogic; import com.hdl.photovoltaic.other.HdlDeviceLogic; @@ -379,11 +380,11 @@ String dataStr = TimeUtils.getDateTimestamp(TimeUtils.getCurrentTimestamp(), TimeUtils.getTimeDateFormat(timeType)); viewBinding.yearMonthDayTv.setText(dataStr); - String installed_capacity = getString(R.string.installed_capacity) + "(" + HdlDeviceLogic.kWp + ")"; + String installed_capacity = getString(R.string.installed_capacity) + "(" + UnitType.kWp + ")"; viewBinding.infoRl1Text2Tv.setText(installed_capacity); - String generated_power = getString(R.string.generated_power) + "(" + HdlDeviceLogic.kW + ")"; + String generated_power = getString(R.string.generated_power) + "(" + UnitType.kW + ")"; viewBinding.infoRl1Text4Tv.setText(generated_power); - String generation = getString(R.string.generation) + "(" + HdlDeviceLogic.kWh + ")"; + String generation = getString(R.string.generation) + "(" + UnitType.kWh + ")"; viewBinding.homePageStationInfoRl1TitleTv.setText(generation); viewBinding.homePageStationInfoRl2DayIc.dataTypeTv.setText(R.string.day_power_generation); @@ -391,7 +392,7 @@ viewBinding.homePageStationInfoRl2YearIc.dataTypeTv.setText(R.string.year_power_generation); viewBinding.homePageStationInfoRl2CumulativeIc.dataTypeTv.setText(R.string.cumulative_power_generation); - viewBinding.unitTv.setText(HdlDeviceLogic.kW); + viewBinding.unitTv.setText(UnitType.kW); viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494)); viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_38C494)); viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); -- Gitblit v1.8.0