diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt index 148c993..44e7e38 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt @@ -31,7 +31,6 @@ private lateinit var wellViewModel: WellViewModel private lateinit var infrastructureViewModel: InfrastructureViewModel private lateinit var deviceViewModel: DeviceViewModel - private val xAxisLabel = arrayListOf("井盖状态监测仪", "液位监测仪", "有害气体监测仪", "噪声记录仪", "消防栓防盗水监测仪") override fun initLayoutView(): Int = R.layout.fragment_statistics @@ -54,6 +53,7 @@ if (it.code == 200) { var totalAlarm = 0 + val xAxisLabel: MutableList = ArrayList() val barEntries: MutableList = ArrayList() it.data.forEachIndexed { index, dataModel -> @@ -64,6 +64,8 @@ index.toFloat(), dataModel.`_$1`.toFloat() + dataModel.`_$2`.toFloat() ) ) + + xAxisLabel.add(dataModel.deviceType) } totalAlarmView.text = totalAlarm.toString() diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt index 148c993..44e7e38 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt @@ -31,7 +31,6 @@ private lateinit var wellViewModel: WellViewModel private lateinit var infrastructureViewModel: InfrastructureViewModel private lateinit var deviceViewModel: DeviceViewModel - private val xAxisLabel = arrayListOf("井盖状态监测仪", "液位监测仪", "有害气体监测仪", "噪声记录仪", "消防栓防盗水监测仪") override fun initLayoutView(): Int = R.layout.fragment_statistics @@ -54,6 +53,7 @@ if (it.code == 200) { var totalAlarm = 0 + val xAxisLabel: MutableList = ArrayList() val barEntries: MutableList = ArrayList() it.data.forEachIndexed { index, dataModel -> @@ -64,6 +64,8 @@ index.toFloat(), dataModel.`_$1`.toFloat() + dataModel.`_$2`.toFloat() ) ) + + xAxisLabel.add(dataModel.deviceType) } totalAlarmView.text = totalAlarm.toString() diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java index 8ba5e8d..0ee79fc 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java +++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java @@ -7,7 +7,7 @@ public class AlarmStatisticsModel { private int code; - private List data; + private List data; private String message; private boolean success; @@ -19,11 +19,11 @@ this.code = code; } - public List getData() { + public List getData() { return data; } - public void setData(List data) { + public void setData(List data) { this.data = data; } @@ -43,12 +43,12 @@ this.success = success; } - public static class DataModel { + public static class DataDTO { @SerializedName("1") private String _$1; - private String deviceType; @SerializedName("2") private String _$2; + private String deviceType; public String get_$1() { return _$1; @@ -58,14 +58,6 @@ this._$1 = _$1; } - public String getDeviceType() { - return deviceType; - } - - public void setDeviceType(String deviceType) { - this.deviceType = deviceType; - } - public String get_$2() { return _$2; } @@ -73,5 +65,13 @@ public void set_$2(String _$2) { this._$2 = _$2; } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } } }