diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt index c0f5c2d..b52c923 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt @@ -84,7 +84,12 @@ /** * 竖直柱状图 * */ - fun setBarChartData(chart: BarChart, xAxisLabel: MutableList, entries: List) { + fun setBarChartData( + chart: BarChart, + xAxisLabel: MutableList, + entries: List, + dateType: String + ) { //每次加载数据都初始化饼图 chart.init(xAxisLabel) val barDataSets: MutableList = ArrayList() @@ -103,7 +108,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(true) + markerView.setBarDataType(dateType) chart.marker = markerView chart.data = barData chart.invalidate() @@ -135,7 +140,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(false) + markerView.setBarDataType("") chart.marker = markerView chart.data = barData chart.invalidate() diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt index c0f5c2d..b52c923 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt @@ -84,7 +84,12 @@ /** * 竖直柱状图 * */ - fun setBarChartData(chart: BarChart, xAxisLabel: MutableList, entries: List) { + fun setBarChartData( + chart: BarChart, + xAxisLabel: MutableList, + entries: List, + dateType: String + ) { //每次加载数据都初始化饼图 chart.init(xAxisLabel) val barDataSets: MutableList = ArrayList() @@ -103,7 +108,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(true) + markerView.setBarDataType(dateType) chart.marker = markerView chart.data = barData chart.invalidate() @@ -135,7 +140,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(false) + markerView.setBarDataType("") chart.marker = markerView chart.data = barData chart.invalidate() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt index 08c5ecc..7029d17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt @@ -2,13 +2,14 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseActivity +import kotlinx.android.synthetic.main.include_base_title.* class DeviceDataDetailActivity : BaseActivity() { override fun initLayoutView(): Int = R.layout.activity_device_detail override fun setupTopBarLayout() { - + titleView.text = "历史数据" } override fun initData() { diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt index c0f5c2d..b52c923 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt @@ -84,7 +84,12 @@ /** * 竖直柱状图 * */ - fun setBarChartData(chart: BarChart, xAxisLabel: MutableList, entries: List) { + fun setBarChartData( + chart: BarChart, + xAxisLabel: MutableList, + entries: List, + dateType: String + ) { //每次加载数据都初始化饼图 chart.init(xAxisLabel) val barDataSets: MutableList = ArrayList() @@ -103,7 +108,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(true) + markerView.setBarDataType(dateType) chart.marker = markerView chart.data = barData chart.invalidate() @@ -135,7 +140,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(false) + markerView.setBarDataType("") chart.marker = markerView chart.data = barData chart.invalidate() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt index 08c5ecc..7029d17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt @@ -2,13 +2,14 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseActivity +import kotlinx.android.synthetic.main.include_base_title.* class DeviceDataDetailActivity : BaseActivity() { override fun initLayoutView(): Int = R.layout.activity_device_detail override fun setupTopBarLayout() { - + titleView.text = "历史数据" } override fun initData() { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt index 142be88..8cab864 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt @@ -34,7 +34,7 @@ private var authenticatedType: MutableList = ArrayList() private var deviceTypeValue = "" private var deptId = "" - private var deviceState = "0" + private var deviceState = "" private var areaId = "" override fun initLayoutView(): Int = R.layout.activity_search_record diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt index c0f5c2d..b52c923 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt @@ -84,7 +84,12 @@ /** * 竖直柱状图 * */ - fun setBarChartData(chart: BarChart, xAxisLabel: MutableList, entries: List) { + fun setBarChartData( + chart: BarChart, + xAxisLabel: MutableList, + entries: List, + dateType: String + ) { //每次加载数据都初始化饼图 chart.init(xAxisLabel) val barDataSets: MutableList = ArrayList() @@ -103,7 +108,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(true) + markerView.setBarDataType(dateType) chart.marker = markerView chart.data = barData chart.invalidate() @@ -135,7 +140,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(false) + markerView.setBarDataType("") chart.marker = markerView chart.data = barData chart.invalidate() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt index 08c5ecc..7029d17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt @@ -2,13 +2,14 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseActivity +import kotlinx.android.synthetic.main.include_base_title.* class DeviceDataDetailActivity : BaseActivity() { override fun initLayoutView(): Int = R.layout.activity_device_detail override fun setupTopBarLayout() { - + titleView.text = "历史数据" } override fun initData() { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt index 142be88..8cab864 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt @@ -34,7 +34,7 @@ private var authenticatedType: MutableList = ArrayList() private var deviceTypeValue = "" private var deptId = "" - private var deviceState = "0" + private var deviceState = "" private var areaId = "" override fun initLayoutView(): Int = R.layout.activity_search_record diff --git a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt index 2d59345..21c4286 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt @@ -141,7 +141,7 @@ //饼图 pieEntries.add(PieEntry(dataValue, dataBean.areaName)) } - ChartViewHelper.setBarChartData(waterBarChart, xAxisLabel, barEntries) + ChartViewHelper.setBarChartData(waterBarChart, xAxisLabel, barEntries, "water") ChartViewHelper.setPieChartData(waterPieChart, pieEntries) } }) @@ -240,7 +240,7 @@ //柱状图 barEntries.add(BarEntry(index.toFloat(), dataValue)) } - ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries) + ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries, "alarm") } }) diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt index c0f5c2d..b52c923 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt @@ -84,7 +84,12 @@ /** * 竖直柱状图 * */ - fun setBarChartData(chart: BarChart, xAxisLabel: MutableList, entries: List) { + fun setBarChartData( + chart: BarChart, + xAxisLabel: MutableList, + entries: List, + dateType: String + ) { //每次加载数据都初始化饼图 chart.init(xAxisLabel) val barDataSets: MutableList = ArrayList() @@ -103,7 +108,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(true) + markerView.setBarDataType(dateType) chart.marker = markerView chart.data = barData chart.invalidate() @@ -135,7 +140,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(false) + markerView.setBarDataType("") chart.marker = markerView chart.data = barData chart.invalidate() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt index 08c5ecc..7029d17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt @@ -2,13 +2,14 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseActivity +import kotlinx.android.synthetic.main.include_base_title.* class DeviceDataDetailActivity : BaseActivity() { override fun initLayoutView(): Int = R.layout.activity_device_detail override fun setupTopBarLayout() { - + titleView.text = "历史数据" } override fun initData() { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt index 142be88..8cab864 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt @@ -34,7 +34,7 @@ private var authenticatedType: MutableList = ArrayList() private var deviceTypeValue = "" private var deptId = "" - private var deviceState = "0" + private var deviceState = "" private var areaId = "" override fun initLayoutView(): Int = R.layout.activity_search_record diff --git a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt index 2d59345..21c4286 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt @@ -141,7 +141,7 @@ //饼图 pieEntries.add(PieEntry(dataValue, dataBean.areaName)) } - ChartViewHelper.setBarChartData(waterBarChart, xAxisLabel, barEntries) + ChartViewHelper.setBarChartData(waterBarChart, xAxisLabel, barEntries, "water") ChartViewHelper.setPieChartData(waterPieChart, pieEntries) } }) @@ -240,7 +240,7 @@ //柱状图 barEntries.add(BarEntry(index.toFloat(), dataValue)) } - ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries) + ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries, "alarm") } }) diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt index 02f30c1..82f6e19 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt @@ -16,14 +16,14 @@ private val factoryView: TextView = findViewById(R.id.factoryView) private val dataView: TextView = findViewById(R.id.dataView) private var xAxisLabel: MutableList = ArrayList() - private var isWaterData = true + private var dateType = "" fun setXAxisLabel(label: MutableList) { this.xAxisLabel = label } - fun setBarDataType(isWater: Boolean) { - this.isWaterData = isWater + fun setBarDataType(type: String) { + this.dateType = type } //每次重绘，会调用此方法刷新数据 @@ -31,12 +31,11 @@ super.refreshContent(e, highlight) try { factoryView.text = xAxisLabel[(e.x).toInt()] - if (isWaterData) { - dataView.text = - String.format("用水量：${decimalFormat.format(e.y.toString().toDouble())}t") - } else { - dataView.text = - String.format("设备数量：${decimalFormat.format(e.y.toString().toDouble())}") + val dataValue = decimalFormat.format(e.y.toString().toDouble()) + when (dateType) { + "water" -> dataView.text = String.format("用水量：${dataValue}t") + "alarm" -> dataView.text = String.format("告警数：${dataValue}") + else -> dataView.text = String.format("设备数量：${dataValue}") } } catch (e1: Exception) { e1.printStackTrace() diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt index c0f5c2d..b52c923 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt @@ -84,7 +84,12 @@ /** * 竖直柱状图 * */ - fun setBarChartData(chart: BarChart, xAxisLabel: MutableList, entries: List) { + fun setBarChartData( + chart: BarChart, + xAxisLabel: MutableList, + entries: List, + dateType: String + ) { //每次加载数据都初始化饼图 chart.init(xAxisLabel) val barDataSets: MutableList = ArrayList() @@ -103,7 +108,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(true) + markerView.setBarDataType(dateType) chart.marker = markerView chart.data = barData chart.invalidate() @@ -135,7 +140,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(false) + markerView.setBarDataType("") chart.marker = markerView chart.data = barData chart.invalidate() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt index 08c5ecc..7029d17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt @@ -2,13 +2,14 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseActivity +import kotlinx.android.synthetic.main.include_base_title.* class DeviceDataDetailActivity : BaseActivity() { override fun initLayoutView(): Int = R.layout.activity_device_detail override fun setupTopBarLayout() { - + titleView.text = "历史数据" } override fun initData() { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt index 142be88..8cab864 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt @@ -34,7 +34,7 @@ private var authenticatedType: MutableList = ArrayList() private var deviceTypeValue = "" private var deptId = "" - private var deviceState = "0" + private var deviceState = "" private var areaId = "" override fun initLayoutView(): Int = R.layout.activity_search_record diff --git a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt index 2d59345..21c4286 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt @@ -141,7 +141,7 @@ //饼图 pieEntries.add(PieEntry(dataValue, dataBean.areaName)) } - ChartViewHelper.setBarChartData(waterBarChart, xAxisLabel, barEntries) + ChartViewHelper.setBarChartData(waterBarChart, xAxisLabel, barEntries, "water") ChartViewHelper.setPieChartData(waterPieChart, pieEntries) } }) @@ -240,7 +240,7 @@ //柱状图 barEntries.add(BarEntry(index.toFloat(), dataValue)) } - ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries) + ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries, "alarm") } }) diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt index 02f30c1..82f6e19 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt @@ -16,14 +16,14 @@ private val factoryView: TextView = findViewById(R.id.factoryView) private val dataView: TextView = findViewById(R.id.dataView) private var xAxisLabel: MutableList = ArrayList() - private var isWaterData = true + private var dateType = "" fun setXAxisLabel(label: MutableList) { this.xAxisLabel = label } - fun setBarDataType(isWater: Boolean) { - this.isWaterData = isWater + fun setBarDataType(type: String) { + this.dateType = type } //每次重绘，会调用此方法刷新数据 @@ -31,12 +31,11 @@ super.refreshContent(e, highlight) try { factoryView.text = xAxisLabel[(e.x).toInt()] - if (isWaterData) { - dataView.text = - String.format("用水量：${decimalFormat.format(e.y.toString().toDouble())}t") - } else { - dataView.text = - String.format("设备数量：${decimalFormat.format(e.y.toString().toDouble())}") + val dataValue = decimalFormat.format(e.y.toString().toDouble()) + when (dateType) { + "water" -> dataView.text = String.format("用水量：${dataValue}t") + "alarm" -> dataView.text = String.format("告警数：${dataValue}") + else -> dataView.text = String.format("设备数量：${dataValue}") } } catch (e1: Exception) { e1.printStackTrace() diff --git a/app/src/main/res/drawable/bg_view_green.xml b/app/src/main/res/drawable/bg_view_green.xml index db18d54..f08666b 100644 --- a/app/src/main/res/drawable/bg_view_green.xml +++ b/app/src/main/res/drawable/bg_view_green.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt index c0f5c2d..b52c923 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt @@ -84,7 +84,12 @@ /** * 竖直柱状图 * */ - fun setBarChartData(chart: BarChart, xAxisLabel: MutableList, entries: List) { + fun setBarChartData( + chart: BarChart, + xAxisLabel: MutableList, + entries: List, + dateType: String + ) { //每次加载数据都初始化饼图 chart.init(xAxisLabel) val barDataSets: MutableList = ArrayList() @@ -103,7 +108,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(true) + markerView.setBarDataType(dateType) chart.marker = markerView chart.data = barData chart.invalidate() @@ -135,7 +140,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(false) + markerView.setBarDataType("") chart.marker = markerView chart.data = barData chart.invalidate() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt index 08c5ecc..7029d17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt @@ -2,13 +2,14 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseActivity +import kotlinx.android.synthetic.main.include_base_title.* class DeviceDataDetailActivity : BaseActivity() { override fun initLayoutView(): Int = R.layout.activity_device_detail override fun setupTopBarLayout() { - + titleView.text = "历史数据" } override fun initData() { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt index 142be88..8cab864 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt @@ -34,7 +34,7 @@ private var authenticatedType: MutableList = ArrayList() private var deviceTypeValue = "" private var deptId = "" - private var deviceState = "0" + private var deviceState = "" private var areaId = "" override fun initLayoutView(): Int = R.layout.activity_search_record diff --git a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt index 2d59345..21c4286 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt @@ -141,7 +141,7 @@ //饼图 pieEntries.add(PieEntry(dataValue, dataBean.areaName)) } - ChartViewHelper.setBarChartData(waterBarChart, xAxisLabel, barEntries) + ChartViewHelper.setBarChartData(waterBarChart, xAxisLabel, barEntries, "water") ChartViewHelper.setPieChartData(waterPieChart, pieEntries) } }) @@ -240,7 +240,7 @@ //柱状图 barEntries.add(BarEntry(index.toFloat(), dataValue)) } - ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries) + ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries, "alarm") } }) diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt index 02f30c1..82f6e19 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt @@ -16,14 +16,14 @@ private val factoryView: TextView = findViewById(R.id.factoryView) private val dataView: TextView = findViewById(R.id.dataView) private var xAxisLabel: MutableList = ArrayList() - private var isWaterData = true + private var dateType = "" fun setXAxisLabel(label: MutableList) { this.xAxisLabel = label } - fun setBarDataType(isWater: Boolean) { - this.isWaterData = isWater + fun setBarDataType(type: String) { + this.dateType = type } //每次重绘，会调用此方法刷新数据 @@ -31,12 +31,11 @@ super.refreshContent(e, highlight) try { factoryView.text = xAxisLabel[(e.x).toInt()] - if (isWaterData) { - dataView.text = - String.format("用水量：${decimalFormat.format(e.y.toString().toDouble())}t") - } else { - dataView.text = - String.format("设备数量：${decimalFormat.format(e.y.toString().toDouble())}") + val dataValue = decimalFormat.format(e.y.toString().toDouble()) + when (dateType) { + "water" -> dataView.text = String.format("用水量：${dataValue}t") + "alarm" -> dataView.text = String.format("告警数：${dataValue}") + else -> dataView.text = String.format("设备数量：${dataValue}") } } catch (e1: Exception) { e1.printStackTrace() diff --git a/app/src/main/res/drawable/bg_view_green.xml b/app/src/main/res/drawable/bg_view_green.xml index db18d54..f08666b 100644 --- a/app/src/main/res/drawable/bg_view_green.xml +++ b/app/src/main/res/drawable/bg_view_green.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_device_detail.xml b/app/src/main/res/layout/activity_device_detail.xml index 77d9ef6..7ead47b 100644 --- a/app/src/main/res/layout/activity_device_detail.xml +++ b/app/src/main/res/layout/activity_device_detail.xml @@ -1,6 +1,32 @@ - + android:layout_height="match_parent" + android:background="@color/mainBackColor" + android:orientation="vertical" + tools:context=".view.DeviceDataDetailActivity"> - \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt index c0f5c2d..b52c923 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt @@ -84,7 +84,12 @@ /** * 竖直柱状图 * */ - fun setBarChartData(chart: BarChart, xAxisLabel: MutableList, entries: List) { + fun setBarChartData( + chart: BarChart, + xAxisLabel: MutableList, + entries: List, + dateType: String + ) { //每次加载数据都初始化饼图 chart.init(xAxisLabel) val barDataSets: MutableList = ArrayList() @@ -103,7 +108,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(true) + markerView.setBarDataType(dateType) chart.marker = markerView chart.data = barData chart.invalidate() @@ -135,7 +140,7 @@ val markerView = BarChartMarkerView(BaseApplication.obtainInstance()) markerView.chartView = chart markerView.setXAxisLabel(xAxisLabel) - markerView.setBarDataType(false) + markerView.setBarDataType("") chart.marker = markerView chart.data = barData chart.invalidate() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt index 08c5ecc..7029d17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt @@ -2,13 +2,14 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseActivity +import kotlinx.android.synthetic.main.include_base_title.* class DeviceDataDetailActivity : BaseActivity() { override fun initLayoutView(): Int = R.layout.activity_device_detail override fun setupTopBarLayout() { - + titleView.text = "历史数据" } override fun initData() { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt index 142be88..8cab864 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchRecordActivity.kt @@ -34,7 +34,7 @@ private var authenticatedType: MutableList = ArrayList() private var deviceTypeValue = "" private var deptId = "" - private var deviceState = "0" + private var deviceState = "" private var areaId = "" override fun initLayoutView(): Int = R.layout.activity_search_record diff --git a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt index 2d59345..21c4286 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt @@ -141,7 +141,7 @@ //饼图 pieEntries.add(PieEntry(dataValue, dataBean.areaName)) } - ChartViewHelper.setBarChartData(waterBarChart, xAxisLabel, barEntries) + ChartViewHelper.setBarChartData(waterBarChart, xAxisLabel, barEntries, "water") ChartViewHelper.setPieChartData(waterPieChart, pieEntries) } }) @@ -240,7 +240,7 @@ //柱状图 barEntries.add(BarEntry(index.toFloat(), dataValue)) } - ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries) + ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries, "alarm") } }) diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt index 02f30c1..82f6e19 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/BarChartMarkerView.kt @@ -16,14 +16,14 @@ private val factoryView: TextView = findViewById(R.id.factoryView) private val dataView: TextView = findViewById(R.id.dataView) private var xAxisLabel: MutableList = ArrayList() - private var isWaterData = true + private var dateType = "" fun setXAxisLabel(label: MutableList) { this.xAxisLabel = label } - fun setBarDataType(isWater: Boolean) { - this.isWaterData = isWater + fun setBarDataType(type: String) { + this.dateType = type } //每次重绘，会调用此方法刷新数据 @@ -31,12 +31,11 @@ super.refreshContent(e, highlight) try { factoryView.text = xAxisLabel[(e.x).toInt()] - if (isWaterData) { - dataView.text = - String.format("用水量：${decimalFormat.format(e.y.toString().toDouble())}t") - } else { - dataView.text = - String.format("设备数量：${decimalFormat.format(e.y.toString().toDouble())}") + val dataValue = decimalFormat.format(e.y.toString().toDouble()) + when (dateType) { + "water" -> dataView.text = String.format("用水量：${dataValue}t") + "alarm" -> dataView.text = String.format("告警数：${dataValue}") + else -> dataView.text = String.format("设备数量：${dataValue}") } } catch (e1: Exception) { e1.printStackTrace() diff --git a/app/src/main/res/drawable/bg_view_green.xml b/app/src/main/res/drawable/bg_view_green.xml index db18d54..f08666b 100644 --- a/app/src/main/res/drawable/bg_view_green.xml +++ b/app/src/main/res/drawable/bg_view_green.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_device_detail.xml b/app/src/main/res/layout/activity_device_detail.xml index 77d9ef6..7ead47b 100644 --- a/app/src/main/res/layout/activity_device_detail.xml +++ b/app/src/main/res/layout/activity_device_detail.xml @@ -1,6 +1,32 @@ - + android:layout_height="match_parent" + android:background="@color/mainBackColor" + android:orientation="vertical" + tools:context=".view.DeviceDataDetailActivity"> - \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9e09837..575a0b1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -8,17 +8,17 @@ #DDDDDD #FF0000 #FF6600 - #96E9B5 + #66FFB5 #C0000000 - #37D4AE - #CCFF66 - #FF6666 - #FFCCCC - #FFFF99 - #CCCCFF - #6666FF - #CCFF66 - #66CCCC + #96e9b5 + #ff8078 + #80bbff + #916bff + #ffe1ab + #6666FF + #CCFF66 + #37D4AE + #feb5a2 \ No newline at end of file