From d24c8a8d62caf0c0902246972a80f34edd098ba0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 21 五月 2024 17:09:25 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 bc40105..ed03410 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,15 +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;
@@ -81,7 +80,6 @@
@Override
public void onBindView(Bundle savedInstanceState) {
-
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -120,7 +118,7 @@
viewBinding.homeAllIl.parentLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-
+ HdlCommonLogic.getInstance().postEventBus(ConstantManage.station_status, PowerStationStatus.All);
}
});
@@ -128,18 +126,21 @@
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);
}
});
//鏃堕棿閫夋嫨鍣�
@@ -388,9 +389,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);
@@ -465,6 +464,7 @@
}
}
+
/**
* 鐢电珯鐘舵�佹瑙�
*/
--
Gitblit v1.8.0