From 50101e1b1c152c5346a6f4e63a7c6db98809e4d9 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期三, 22 五月 2024 15:02:42 +0800 Subject: [PATCH] 2024年05月22日15:02:36 --- app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 50 ++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 40 insertions(+), 10 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..ac13b6a 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 @@ -21,13 +21,14 @@ import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseFragment; import com.hdl.photovoltaic.config.ConstantManage; -import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.FragmentHomePageBinding; import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch; +import com.hdl.photovoltaic.enums.PowerStationStatus; +import com.hdl.photovoltaic.enums.PowerStationStatusType; 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; import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlPowerStationDataStatisticsLogic; import com.hdl.photovoltaic.other.HdlResidenceLogic; @@ -79,7 +80,6 @@ @Override public void onBindView(Bundle savedInstanceState) { - //鍒濆鍖� initView(); //鍒濆鍖栫晫闈㈢洃鍚櫒 @@ -111,6 +111,36 @@ @Override public void onClick(View v) { HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); + } + }); + + //鍏ㄩ儴 + viewBinding.homeAllIl.parentLl.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + HdlCommonLogic.getInstance().postEventBus(ConstantManage.station_status, PowerStationStatus.All); + + } + }); + //鏁呴殰 + viewBinding.homeFaultsIl.parentLl.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + HdlCommonLogic.getInstance().postEventBus(ConstantManage.station_status, PowerStationStatus.malfunction); + } + }); + //绂荤嚎 + viewBinding.homeOfflineIl.parentLl.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + HdlCommonLogic.getInstance().postEventBus(ConstantManage.station_status, PowerStationStatus.off); + } + }); + //寰呮帴鍏� + viewBinding.homeConnectedIl.parentLl.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + HdlCommonLogic.getInstance().postEventBus(ConstantManage.station_status, PowerStationStatus.connecting); } }); //鏃堕棿閫夋嫨鍣� @@ -256,6 +286,7 @@ String timeDateFormat = TimeUtils.getTimeDateFormat(timeType); Calendar calendar = TimeUtils.stringToCalendar(currDate, timeDateFormat); String time = TimeUtils.subtractDayMonthYearFromDate(calendar, 1, timeDateFormat, timeType); + //涓嶉渶瑕侀檺鍒舵渶灏忔棩鏈燂紝鍥犱负鏄煡璇㈣处鍙蜂笅鎵�鏈夌數绔欙紝鏃犳硶鐭ラ亾鏈�灏忓缓绔欐棩鏈� viewBinding.yearMonthDayTv.setText(time); getStatistics(); @@ -359,9 +390,7 @@ aaChartView.callBack = this; 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)) { + } else if (TimeType.month.equals(timeType) || TimeType.year.equals(timeType) || TimeType.all.equals(timeType)) { aaChartModel = configureColorfulColumnChart(getString(R.string.pv_power), fieldNames, fieldValues); } aaChartView.aa_drawChartWithChartModel(aaChartModel); @@ -379,11 +408,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 +420,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)); @@ -436,6 +465,7 @@ } } + /** * 鐢电珯鐘舵�佹瑙� */ -- Gitblit v1.8.0