From 2b805d413e924bc0a8e80e1280208d9af8d93cb1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:07 +0800
Subject: [PATCH] 2024年05月30日21:11:54
---
aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java | 64 ++++++++++++---------
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 6 +
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 73 +++++++++++++++--------
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java | 17 ++---
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java | 8 ++
5 files changed, 103 insertions(+), 65 deletions(-)
diff --git a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
index 385b02e..7434cc7 100644
--- a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
+++ b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
@@ -1,20 +1,35 @@
/**
- // AAOptionsConstructor.java
- // AAChartCore
- //
- // Created by AnAn on 2018/12/08.
- // Copyright 漏 2018骞� An An. All rights reserved.
- /**
+ * // AAOptionsConstructor.java
+ * // AAChartCore
+ * //
+ * // Created by AnAn on 2018/12/08.
+ * // Copyright 漏 2018骞� An An. All rights reserved.
+ * /**
* 鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼� ...... SOURCE CODE ......鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼�
* 鈼夆棄鈼�................................................... 鈼夆棄鈼�
* 鈼夆棄鈼� https://github.com/AAChartModel/AAChartCore 鈼夆棄鈼�
* 鈼夆棄鈼� https://github.com/AAChartModel/AAChartCore-Kotlin 鈼夆棄鈼�
* 鈼夆棄鈼�................................................... 鈼夆棄鈼�
* 鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼� ...... SOURCE CODE ......鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼�
+ * <p>
+ * <p>
+ * -------------------------------------------------------------------------------
+ * <p>
+ * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
+ * <p>
+ * Please contact me on GitHub,if there are any problems encountered in use.
+ * GitHub Issues : https://github.com/AAChartModel/AAChartCore/issues
+ * -------------------------------------------------------------------------------
+ * And if you want to contribute for this project, please contact me as well
+ * GitHub : https://github.com/AAChartModel
+ * StackOverflow : https://stackoverflow.com/users/7842508/codeforu
+ * JianShu : http://www.jianshu.com/u/f1e6753d4254
+ * SegmentFault : https://segmentfault.com/u/huanghunbieguan
+ * <p>
+ * -------------------------------------------------------------------------------
*/
/**
-
* -------------------------------------------------------------------------------
*
* 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
@@ -60,9 +75,8 @@
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AAYAxis;
import com.github.AAChartModel.AAChartCore.AATools.AAColor;
-public class AAOptionsConstructor
-{
- public static AAOptions configureChartOptions (
+public class AAOptionsConstructor {
+ public static AAOptions configureChartOptions(
AAChartModel aaChartModel
) {
AAChart aaChart = new AAChart()
@@ -73,19 +87,16 @@
.panning(true) //璁剧疆鎵嬪娍缂╂斁鍚庢槸鍚﹀彲骞崇Щ
.polar(aaChartModel.polar) //鏄惁鏋佸寲鍥捐〃(寮�鍚瀬鍧愭爣妯″紡)
.margin(aaChartModel.margin) //鍥捐〃杈硅窛
- .scrollablePlotArea(aaChartModel.scrollablePlotArea)
- ;
+ .scrollablePlotArea(aaChartModel.scrollablePlotArea);
AATitle aaTitle = new AATitle()
.text(aaChartModel.title) //鏍囬鏂囨湰鍐呭
- .style(aaChartModel.titleStyle)
- ;
+ .style(aaChartModel.titleStyle);
AASubtitle aaSubtitle = new AASubtitle()
.text(aaChartModel.subtitle) //鍓爣棰樺唴瀹�
.align(aaChartModel.subtitleAlign) //鍥捐〃鍓爣棰樻枃鏈按骞冲榻愭柟寮忋�傚彲閫夌殑鍊兼湁 鈥渓eft鈥濓紝鈥漜enter鈥滃拰鈥渞ight鈥濄�� 榛樿鏄細center.
- .style(aaChartModel.subtitleStyle)
- ;
+ .style(aaChartModel.subtitleStyle);
AATooltip aaTooltip = new AATooltip()
.enabled(aaChartModel.tooltipEnabled) //鍚敤娴姩鎻愮ず妗�
@@ -96,8 +107,7 @@
AAPlotOptions aaPlotOptions = new AAPlotOptions()
.series(new AASeries()
.stacking(aaChartModel.stacking) //璁剧疆鏄惁鐧惧垎姣斿爢鍙犳樉绀哄浘褰�
- )
- ;
+ );
if (!aaChartModel.animationType.equals(AAChartAnimationType.Linear)) {
aaPlotOptions.series.animation((new AAAnimation()
@@ -106,14 +116,13 @@
));
}
- configureAAPlotOptionsMarkerStyle(aaChartModel,aaPlotOptions);
- configureAAPlotOptionsDataLabels(aaPlotOptions,aaChartModel);
+ configureAAPlotOptionsMarkerStyle(aaChartModel, aaPlotOptions);
+ configureAAPlotOptionsDataLabels(aaPlotOptions, aaChartModel);
AALegend aaLegend = new AALegend()
.enabled(aaChartModel.legendEnabled) //鏄惁鏄剧ず legend
.itemStyle(new AAItemStyle()
- .color(aaChartModel.axesTextColor))
- ;
+ .color(aaChartModel.axesTextColor));
AAOptions aaOptions = new AAOptions()
.chart(aaChart)
@@ -127,12 +136,12 @@
.touchEventEnabled(aaChartModel.touchEventEnabled) //鏄惁鏀寔鐐瑰嚮浜嬩欢
;
- configureAxisContentAndStyle(aaOptions,aaChartModel);
+ configureAxisContentAndStyle(aaOptions, aaChartModel);
return aaOptions;
}
- private static void configureAAPlotOptionsMarkerStyle (
+ private static void configureAAPlotOptionsMarkerStyle(
AAChartModel aaChartModel,
AAPlotOptions aaPlotOptions
) {
@@ -167,7 +176,7 @@
}
- private static void configureAAPlotOptionsDataLabels (
+ private static void configureAAPlotOptionsDataLabels(
AAPlotOptions aaPlotOptions,
AAChartModel aaChartModel
) {
@@ -194,8 +203,7 @@
case AAChartType.Bar:
AABar aaBar = new AABar()
.borderWidth(0f)
- .borderRadius(aaChartModel.borderRadius)
- ;
+ .borderRadius(aaChartModel.borderRadius);
if (aaChartModel.polar) {
aaBar.pointPadding(0f)
.groupPadding(0.005f);
@@ -224,7 +232,7 @@
}
- private static void configureAxisContentAndStyle (
+ private static void configureAxisContentAndStyle(
AAOptions aaOptions,
AAChartModel aaChartModel
) {
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 8867419..ad73e1b 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
@@ -548,7 +548,11 @@
Object[] values = new Object[list.size()];
for (int i = 0; i < list.size(); i++) {
keys[i] = list.get(i).getFieldName();
- values[i] = HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue()).intValue();//鑾峰彇鏁存暟閮ㄥ垎
+ if (TimeType.day.equals(timeType)) {
+ values[i] = HdlCommonLogic.divideByOneThousandAndFormat(list.get(i).getFieldValue());// HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue()).intValue();//鑾峰彇鏁存暟閮ㄥ垎
+ } else {
+ values[i] = HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue());
+ }
}
fieldNames = keys;
fieldValues = values;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
index 9d9686f..df72e80 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
@@ -10,6 +10,7 @@
import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartType;
import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartZoomType;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AAStyle;
+import com.github.AAChartModel.AAChartCore.AAOptionsModel.AATooltip;
import com.github.AAChartModel.AAChartCore.AATools.AAColor;
import com.github.AAChartModel.AAChartCore.AATools.AAGradientColor;
import com.github.AAChartModel.AAChartCore.AATools.AALinearGradientDirection;
@@ -68,6 +69,9 @@
"rgba(56,196,148,0.5)",//娣辩矇鑹�, alpha 閫忔槑搴�1
"rgba(255,255,255,0)"//鐑儏鐨勭矇绾�, alpha 閫忔槑搴� 0.1
);//棰滆壊瀛楃涓茶缃敮鎸佸崄鍏繘鍒剁被鍨嬪拰 rgba 绫诲瀷
+ AATooltip aaTooltip = new AATooltip()
+ .enabled(true)
+ .valueDecimals(2);
AASeriesElement element1 = new AASeriesElement()
.name(tipSuspendName)
// .colorByPoint(true)
@@ -76,17 +80,12 @@
// .borderColor(AARgba(255,255,255,1.0f))
.fillColor(linearGradientColor)
// .fillOpacity(0.5)//鍖哄煙鑳屾櫙閫忔槑搴︼紝璁剧疆0鐨勮瘽鐪嬩笉鍒板尯鍩熻儗鏅�
+ .tooltip(aaTooltip)
.data(data);
+
// AASeriesElement element2 = new AASeriesElement()
// .name("NewYork")
-// .data(new Object[]{0.2, 0.8, 5.7, 11.3, 17.0, 22.0, 24.8, 24.1, 20.1, 14.1, 8.6, 2.5});
-// AASeriesElement element3 = new AASeriesElement()
-// .name("London")
-// .data(new Object[]{0.9, 0.6, 3.5, 8.4, 13.5, 17.0, 18.6, 17.9, 14.3, 9.0, 3.9, 1.0});
-// AASeriesElement element4 = new AASeriesElement()
-// .name("Berlin")
-// .data(new Object[]{3.9, 4.2, 5.7, 8.5, 11.9, 15.2, 17.0, 16.6, 14.2, 10.3, 6.6, 4.8});
-
+// .data(new Object[]{0.45, 0.43, 0.50, 0.55, 0.58, 0.62, 0.83, 0.39, 0.56, 0.67, 0.50, 0.34, 0.50, 0.67, 0.58, 0.29, 0.46, 0.23, 0.47, 0.46, 0.38, 0.56, 0.48, 0.36});
return configureBasicOptions()
.backgroundColor("#EDEFF2")
.legendEnabled(false)
@@ -96,7 +95,7 @@
.chartType(AAChartType.Area)
.categories(categories)
.zoomType(AAChartZoomType.None)//鎵嬪娍缂╂斁
-// .yAxisMax(500)
+// .yAxisMax(100)
.yAxisMin(0)
.series(new AASeriesElement[]{element1});
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java
index d985836..5cc68c7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java
@@ -36,6 +36,9 @@
import java.util.ArrayList;
import java.util.Map;
+/**
+ * 鍥捐〃鏁版嵁娓叉煋
+ */
public class CustomStyleChartComposer {
public static AAChartModel configureColorfulChart() {
@@ -189,6 +192,9 @@
AALinearGradientDirection.ToBottom,
stopsArr
);
+ AATooltip aaTooltip = new AATooltip()
+ .enabled(true)
+ .valueDecimals(2);
return new AAChartModel()
.chartType(AAChartType.Column)
.backgroundColor("#EDEFF2")
@@ -203,7 +209,7 @@
.name(tipSuspendName)
.data(data)
// .colorByPoint(true)
- .tooltip(new AATooltip().style(new AAStyle().backgroundColor("#FFFFFF").fontSize(25)))
+ .tooltip(aaTooltip)
});
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
index cbb05a7..4d410ff 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -118,17 +118,10 @@
return;
}
isClickPowerStationLabel = true;
- viewBinding.powerStationLabel.setTextAppearance(R.style.Text20Style);
- viewBinding.deviceLabel.setTextAppearance(R.style.Text16Style);
- viewBinding.editIv.setVisibility(View.VISIBLE);//缂栬緫鍥炬爣闅愯棌
- viewBinding.addIv.setVisibility(View.VISIBLE);//娣诲姞鍥炬爣闅愯棌
- viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);//鐢电珯鏍囩銆愮埗瀹瑰櫒銆戞樉绀�
- viewBinding.deviceLabelParent.setVisibility(View.GONE);//璁惧鏍囩銆愮埗瀹瑰櫒銆戦殣钘�
- if (viewBinding.deviceNullDataIc.getRoot().getVisibility() == View.VISIBLE) {
- viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
- }
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
+ selectedTitleLabelStyle();
getStatusOverview();
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
+
}
});
//璁惧鏍囩
@@ -139,15 +132,7 @@
return;
}
isClickPowerStationLabel = false;
- viewBinding.deviceLabel.setTextAppearance(R.style.Text20Style);
- viewBinding.powerStationLabel.setTextAppearance(R.style.Text16Style);
- viewBinding.editIv.setVisibility(View.GONE);//缂栬緫鍥炬爣闅愯棌
- viewBinding.addIv.setVisibility(View.GONE);//娣诲姞鍥炬爣闅愯棌
- viewBinding.powerStationLabelParent.setVisibility(View.GONE);//鐢电珯鏍囩銆愮埗瀹瑰櫒銆戦殣钘�
- viewBinding.deviceLabelParent.setVisibility(View.VISIBLE);//璁惧鏍囩銆愮埗瀹瑰櫒銆戞樉绀�
- if (viewBinding.homeNullDataIc.getRoot().getVisibility() == View.VISIBLE) {
- viewBinding.homeNullDataIc.getRoot().setVisibility(View.GONE);
- }
+ selectedTitleLabelStyle();
loadNextPageDeviceList(true, 1, true);
}
});
@@ -156,7 +141,7 @@
@Override
public void onClick(View v) {
powerStationStatusValue = PowerStationStatus.All;
- selectedStationStyle(viewBinding.powerStationAllIl.parentLl, viewBinding.powerStationAllIl.stationTotalTv, viewBinding.powerStationAllIl.stationTitleTv, true);
+ selectedStationStateStyle(viewBinding.powerStationAllIl.parentLl, viewBinding.powerStationAllIl.stationTotalTv, viewBinding.powerStationAllIl.stationTitleTv, true);
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
}
});
@@ -165,7 +150,7 @@
@Override
public void onClick(View v) {
powerStationStatusValue = PowerStationStatus.malfunction;
- selectedStationStyle(viewBinding.powerStationFaultsIl.parentLl, viewBinding.powerStationFaultsIl.stationTotalTv, viewBinding.powerStationFaultsIl.stationTitleTv, true);
+ selectedStationStateStyle(viewBinding.powerStationFaultsIl.parentLl, viewBinding.powerStationFaultsIl.stationTotalTv, viewBinding.powerStationFaultsIl.stationTitleTv, true);
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
}
});
@@ -174,7 +159,7 @@
@Override
public void onClick(View v) {
powerStationStatusValue = PowerStationStatus.off;
- selectedStationStyle(viewBinding.powerStationOfflineIl.parentLl, viewBinding.powerStationOfflineIl.stationTotalTv, viewBinding.powerStationOfflineIl.stationTitleTv, true);
+ selectedStationStateStyle(viewBinding.powerStationOfflineIl.parentLl, viewBinding.powerStationOfflineIl.stationTotalTv, viewBinding.powerStationOfflineIl.stationTitleTv, true);
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
}
});
@@ -183,7 +168,7 @@
@Override
public void onClick(View v) {
powerStationStatusValue = PowerStationStatus.connecting;
- selectedStationStyle(viewBinding.powerStationConnectedIl.parentLl, viewBinding.powerStationConnectedIl.stationTotalTv, viewBinding.powerStationConnectedIl.stationTitleTv, true);
+ selectedStationStateStyle(viewBinding.powerStationConnectedIl.parentLl, viewBinding.powerStationConnectedIl.stationTotalTv, viewBinding.powerStationConnectedIl.stationTitleTv, true);
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
}
});
@@ -506,7 +491,7 @@
viewBinding.powerStationOfflineIl.stationTitleTv.setText(getString(R.string.my_power_station_off_line));
viewBinding.powerStationConnectedIl.stationTitleTv.setText(getString(R.string.to_be_added));
- selectedStationStyle(viewBinding.powerStationAllIl.parentLl, viewBinding.powerStationAllIl.stationTotalTv, viewBinding.powerStationAllIl.stationTitleTv, true);
+ selectedStationStateStyle(viewBinding.powerStationAllIl.parentLl, viewBinding.powerStationAllIl.stationTotalTv, viewBinding.powerStationAllIl.stationTitleTv, true);
//鐢电珯鏍囩
houseInfoAdapter = new HouseInfoAdapter(_mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity));
@@ -523,6 +508,34 @@
}
/**
+ * 鐢电珯鍜岃澶囨爣绛炬牱寮�
+ */
+ private void selectedTitleLabelStyle() {
+ if (isClickPowerStationLabel) {
+ viewBinding.powerStationLabel.setTextAppearance(R.style.Text20Style);
+ viewBinding.deviceLabel.setTextAppearance(R.style.Text16Style);
+ viewBinding.editIv.setVisibility(View.VISIBLE);//缂栬緫鍥炬爣闅愯棌
+ viewBinding.addIv.setVisibility(View.VISIBLE);//娣诲姞鍥炬爣闅愯棌
+ viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);//鐢电珯鏍囩銆愮埗瀹瑰櫒銆戞樉绀�
+ viewBinding.deviceLabelParent.setVisibility(View.GONE);//璁惧鏍囩銆愮埗瀹瑰櫒銆戦殣钘�
+ if (viewBinding.deviceNullDataIc.getRoot().getVisibility() == View.VISIBLE) {
+ viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
+ }
+ } else {
+ viewBinding.deviceLabel.setTextAppearance(R.style.Text20Style);
+ viewBinding.powerStationLabel.setTextAppearance(R.style.Text16Style);
+ viewBinding.editIv.setVisibility(View.GONE);//缂栬緫鍥炬爣闅愯棌
+ viewBinding.addIv.setVisibility(View.GONE);//娣诲姞鍥炬爣闅愯棌
+ viewBinding.powerStationLabelParent.setVisibility(View.GONE);//鐢电珯鏍囩銆愮埗瀹瑰櫒銆戦殣钘�
+ viewBinding.deviceLabelParent.setVisibility(View.VISIBLE);//璁惧鏍囩銆愮埗瀹瑰櫒銆戞樉绀�
+ if (viewBinding.homeNullDataIc.getRoot().getVisibility() == View.VISIBLE) {
+ viewBinding.homeNullDataIc.getRoot().setVisibility(View.GONE);
+ }
+ }
+
+ }
+
+ /**
* 鏄剧ず閫変腑鐘舵�佹牱寮�
*
* @param linearLayout 缁勪欢
@@ -530,7 +543,7 @@
* @param titleTv 缁勪欢
* @param isShowSelectedStatus 鏄惁鏄剧ず鐘舵�佹牱寮�
*/
- private void selectedStationStyle(LinearLayout linearLayout, TextView numberTv, TextView titleTv, boolean isShowSelectedStatus) {
+ private void selectedStationStateStyle(LinearLayout linearLayout, TextView numberTv, TextView titleTv, boolean isShowSelectedStatus) {
viewBinding.powerStationAllIl.parentLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
viewBinding.powerStationFaultsIl.parentLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
viewBinding.powerStationOfflineIl.parentLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
@@ -651,17 +664,25 @@
HdlLogLogic.print("姝e湪鐐瑰嚮銆愮數绔欍��");
if (!isReadData) {
//1锛屼粠棣栭〉-鏁呴殰-杩涙潵-鐢电珯锛堜笉璇诲彇锛�
- //1锛屼粠鐢电珯-杩涙潵-鐢电珯锛堣鍙栦竴娆�,鍚庨潰杩涙潵涓嶅湪璇诲彇锛�
+ //2锛屼粠鐢电珯-杩涙潵-鐢电珯锛堣鍙栦竴娆�,鍚庨潰杩涙潵涓嶅湪璇诲彇锛�
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
getStatusOverview();
}
} else if (eventBus.getType().equals(PowerStationStatus.All)) {
+ isClickPowerStationLabel = true;
+ selectedTitleLabelStyle();
viewBinding.powerStationAllIl.parentLl.performClick();
} else if (eventBus.getType().equals(PowerStationStatus.malfunction)) {
+ isClickPowerStationLabel = true;
+ selectedTitleLabelStyle();
viewBinding.powerStationFaultsIl.parentLl.performClick();
} else if (eventBus.getType().equals(PowerStationStatus.off)) {
+ isClickPowerStationLabel = true;
+ selectedTitleLabelStyle();
viewBinding.powerStationOfflineIl.parentLl.performClick();
} else if (eventBus.getType().equals(PowerStationStatus.connecting)) {
+ isClickPowerStationLabel = true;
+ selectedTitleLabelStyle();
viewBinding.powerStationConnectedIl.parentLl.performClick();
} else if (eventBus.getType().equals(ConstantManage.station_edit)) {
//缂栬緫鍚庢洿鏂颁竴涓嬩綇瀹呭垪琛�
--
Gitblit v1.8.0