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 a65c1c1..e611171 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 @@ -38,9 +38,14 @@ entryModels: List ) { val lineDataSets: MutableList = ArrayList() + val entrySize = entryModels[0].entryList!!.size entryModels.forEachIndexed { index, it -> //设置数据 - val dataSet = LineDataSet(it.entryList, it.entryList?.get(index)?.data.toString()) + val dataSet = if (entrySize == 1) { + LineDataSet(it.entryList, it.entryList?.get(0)?.data.toString()) + } else { + LineDataSet(it.entryList, it.entryList?.get(index)?.data.toString()) + } dataSet.setDrawCircles(true) //线条颜色 dataSet.color = it.lineColor @@ -60,9 +65,17 @@ chart.marker = markerView //设置X轴坐标 val xAxis = chart.xAxis - xAxis.valueFormatter = object : ValueFormatter() { - override fun getFormattedValue(value: Float): String { - return xAxisDate[value.toInt()] + xAxis.valueFormatter = if (entrySize == 1) { + object : ValueFormatter() { + override fun getFormattedValue(value: Float): String { + return xAxisDate[0] + } + } + } else { + object : ValueFormatter() { + override fun getFormattedValue(value: Float): String { + return xAxisDate[value.toInt()] + } } } chart.data = lineData 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 a65c1c1..e611171 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 @@ -38,9 +38,14 @@ entryModels: List ) { val lineDataSets: MutableList = ArrayList() + val entrySize = entryModels[0].entryList!!.size entryModels.forEachIndexed { index, it -> //设置数据 - val dataSet = LineDataSet(it.entryList, it.entryList?.get(index)?.data.toString()) + val dataSet = if (entrySize == 1) { + LineDataSet(it.entryList, it.entryList?.get(0)?.data.toString()) + } else { + LineDataSet(it.entryList, it.entryList?.get(index)?.data.toString()) + } dataSet.setDrawCircles(true) //线条颜色 dataSet.color = it.lineColor @@ -60,9 +65,17 @@ chart.marker = markerView //设置X轴坐标 val xAxis = chart.xAxis - xAxis.valueFormatter = object : ValueFormatter() { - override fun getFormattedValue(value: Float): String { - return xAxisDate[value.toInt()] + xAxis.valueFormatter = if (entrySize == 1) { + object : ValueFormatter() { + override fun getFormattedValue(value: Float): String { + return xAxisDate[0] + } + } + } else { + object : ValueFormatter() { + override fun getFormattedValue(value: Float): String { + return xAxisDate[value.toInt()] + } } } chart.data = lineData diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt index d2ad38f..ae2531b 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt @@ -126,8 +126,7 @@ //初始化折线图,X轴从0开始 val time = System.currentTimeMillis() -// val startDate = time.timestampToLastWeekDate() - val startDate = time.timestampToDate() + val startDate = time.timestampToLastWeekDate() val endDate = time.timestampToDate() waterLineChart.init() //一周折线图数据