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 b52c923..1dabd47 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 @@ -180,61 +180,4 @@ chart.highlightValues(null) chart.invalidate() } - - /*******************************************************************************************/ - - fun setLineChartData( - chart: LineChart, - valveEntries: List?, - meterEntries: List?, - pipelineEntries: List?, - deviceEntries: List? - ) { - val lineDataSets: MutableList = ArrayList() - //设置数据 - val valveDataSet = LineDataSet(valveEntries, "阀门") - valveDataSet.color = - R.color.mainThemeColor.convertColor() //线条颜色 - valveDataSet.setCircleColor(R.color.mainThemeColor.convertColor()) //圆点颜色 - valveDataSet.setDrawFilled(true) - valveDataSet.fillColor = - R.color.mainThemeColor.convertColor() - valveDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(valveDataSet) - - val meterDataSet = LineDataSet(meterEntries, "水表") - meterDataSet.color = - R.color.onLineColor.convertColor() //线条颜色 - meterDataSet.setCircleColor(R.color.onLineColor.convertColor()) //圆点颜色 - meterDataSet.setDrawFilled(true) - meterDataSet.fillColor = - R.color.onLineColor.convertColor() - meterDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(meterDataSet) - - val pipelineDataSet = LineDataSet(pipelineEntries, "管线") - pipelineDataSet.color = - R.color.color_5.convertColor() //线条颜色 - pipelineDataSet.setCircleColor(R.color.color_5.convertColor()) //圆点颜色 - pipelineDataSet.setDrawFilled(true) - pipelineDataSet.fillColor = - R.color.color_5.convertColor() - pipelineDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(pipelineDataSet) - - val deviceDataSet = LineDataSet(deviceEntries, "噪声仪") - deviceDataSet.color = - R.color.color_7.convertColor() //线条颜色 - deviceDataSet.setCircleColor(R.color.color_7.convertColor()) //圆点颜色 - deviceDataSet.setDrawFilled(true) - deviceDataSet.fillColor = - R.color.color_7.convertColor() - deviceDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(deviceDataSet) - - val lineData = LineData(lineDataSets) - lineData.setDrawValues(false) - chart.data = lineData - chart.invalidate() - } } \ 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 b52c923..1dabd47 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 @@ -180,61 +180,4 @@ chart.highlightValues(null) chart.invalidate() } - - /*******************************************************************************************/ - - fun setLineChartData( - chart: LineChart, - valveEntries: List?, - meterEntries: List?, - pipelineEntries: List?, - deviceEntries: List? - ) { - val lineDataSets: MutableList = ArrayList() - //设置数据 - val valveDataSet = LineDataSet(valveEntries, "阀门") - valveDataSet.color = - R.color.mainThemeColor.convertColor() //线条颜色 - valveDataSet.setCircleColor(R.color.mainThemeColor.convertColor()) //圆点颜色 - valveDataSet.setDrawFilled(true) - valveDataSet.fillColor = - R.color.mainThemeColor.convertColor() - valveDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(valveDataSet) - - val meterDataSet = LineDataSet(meterEntries, "水表") - meterDataSet.color = - R.color.onLineColor.convertColor() //线条颜色 - meterDataSet.setCircleColor(R.color.onLineColor.convertColor()) //圆点颜色 - meterDataSet.setDrawFilled(true) - meterDataSet.fillColor = - R.color.onLineColor.convertColor() - meterDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(meterDataSet) - - val pipelineDataSet = LineDataSet(pipelineEntries, "管线") - pipelineDataSet.color = - R.color.color_5.convertColor() //线条颜色 - pipelineDataSet.setCircleColor(R.color.color_5.convertColor()) //圆点颜色 - pipelineDataSet.setDrawFilled(true) - pipelineDataSet.fillColor = - R.color.color_5.convertColor() - pipelineDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(pipelineDataSet) - - val deviceDataSet = LineDataSet(deviceEntries, "噪声仪") - deviceDataSet.color = - R.color.color_7.convertColor() //线条颜色 - deviceDataSet.setCircleColor(R.color.color_7.convertColor()) //圆点颜色 - deviceDataSet.setDrawFilled(true) - deviceDataSet.fillColor = - R.color.color_7.convertColor() - deviceDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(deviceDataSet) - - val lineData = LineData(lineDataSets) - lineData.setDrawValues(false) - chart.data = lineData - chart.invalidate() - } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_data_search.xml b/app/src/main/res/layout/activity_data_search.xml index b4ed22a..55b4ee0 100644 --- a/app/src/main/res/layout/activity_data_search.xml +++ b/app/src/main/res/layout/activity_data_search.xml @@ -114,6 +114,8 @@ android:theme="@style/EditTextTheme" /> + + ?, - meterEntries: List?, - pipelineEntries: List?, - deviceEntries: List? - ) { - val lineDataSets: MutableList = ArrayList() - //设置数据 - val valveDataSet = LineDataSet(valveEntries, "阀门") - valveDataSet.color = - R.color.mainThemeColor.convertColor() //线条颜色 - valveDataSet.setCircleColor(R.color.mainThemeColor.convertColor()) //圆点颜色 - valveDataSet.setDrawFilled(true) - valveDataSet.fillColor = - R.color.mainThemeColor.convertColor() - valveDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(valveDataSet) - - val meterDataSet = LineDataSet(meterEntries, "水表") - meterDataSet.color = - R.color.onLineColor.convertColor() //线条颜色 - meterDataSet.setCircleColor(R.color.onLineColor.convertColor()) //圆点颜色 - meterDataSet.setDrawFilled(true) - meterDataSet.fillColor = - R.color.onLineColor.convertColor() - meterDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(meterDataSet) - - val pipelineDataSet = LineDataSet(pipelineEntries, "管线") - pipelineDataSet.color = - R.color.color_5.convertColor() //线条颜色 - pipelineDataSet.setCircleColor(R.color.color_5.convertColor()) //圆点颜色 - pipelineDataSet.setDrawFilled(true) - pipelineDataSet.fillColor = - R.color.color_5.convertColor() - pipelineDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(pipelineDataSet) - - val deviceDataSet = LineDataSet(deviceEntries, "噪声仪") - deviceDataSet.color = - R.color.color_7.convertColor() //线条颜色 - deviceDataSet.setCircleColor(R.color.color_7.convertColor()) //圆点颜色 - deviceDataSet.setDrawFilled(true) - deviceDataSet.fillColor = - R.color.color_7.convertColor() - deviceDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(deviceDataSet) - - val lineData = LineData(lineDataSets) - lineData.setDrawValues(false) - chart.data = lineData - chart.invalidate() - } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_data_search.xml b/app/src/main/res/layout/activity_data_search.xml index b4ed22a..55b4ee0 100644 --- a/app/src/main/res/layout/activity_data_search.xml +++ b/app/src/main/res/layout/activity_data_search.xml @@ -114,6 +114,8 @@ android:theme="@style/EditTextTheme" /> + + + + + + + + + + ?, - meterEntries: List?, - pipelineEntries: List?, - deviceEntries: List? - ) { - val lineDataSets: MutableList = ArrayList() - //设置数据 - val valveDataSet = LineDataSet(valveEntries, "阀门") - valveDataSet.color = - R.color.mainThemeColor.convertColor() //线条颜色 - valveDataSet.setCircleColor(R.color.mainThemeColor.convertColor()) //圆点颜色 - valveDataSet.setDrawFilled(true) - valveDataSet.fillColor = - R.color.mainThemeColor.convertColor() - valveDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(valveDataSet) - - val meterDataSet = LineDataSet(meterEntries, "水表") - meterDataSet.color = - R.color.onLineColor.convertColor() //线条颜色 - meterDataSet.setCircleColor(R.color.onLineColor.convertColor()) //圆点颜色 - meterDataSet.setDrawFilled(true) - meterDataSet.fillColor = - R.color.onLineColor.convertColor() - meterDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(meterDataSet) - - val pipelineDataSet = LineDataSet(pipelineEntries, "管线") - pipelineDataSet.color = - R.color.color_5.convertColor() //线条颜色 - pipelineDataSet.setCircleColor(R.color.color_5.convertColor()) //圆点颜色 - pipelineDataSet.setDrawFilled(true) - pipelineDataSet.fillColor = - R.color.color_5.convertColor() - pipelineDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(pipelineDataSet) - - val deviceDataSet = LineDataSet(deviceEntries, "噪声仪") - deviceDataSet.color = - R.color.color_7.convertColor() //线条颜色 - deviceDataSet.setCircleColor(R.color.color_7.convertColor()) //圆点颜色 - deviceDataSet.setDrawFilled(true) - deviceDataSet.fillColor = - R.color.color_7.convertColor() - deviceDataSet.mode = LineDataSet.Mode.CUBIC_BEZIER - lineDataSets.add(deviceDataSet) - - val lineData = LineData(lineDataSets) - lineData.setDrawValues(false) - chart.data = lineData - chart.invalidate() - } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_data_search.xml b/app/src/main/res/layout/activity_data_search.xml index b4ed22a..55b4ee0 100644 --- a/app/src/main/res/layout/activity_data_search.xml +++ b/app/src/main/res/layout/activity_data_search.xml @@ -114,6 +114,8 @@ android:theme="@style/EditTextTheme" /> + + + + + + + + + + 1dp @dimen/dp_10 @dimen/dp_10 - @color/mainBackground + @color/mainBackColor