diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt index 0644cff..cd6f75c 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt @@ -30,6 +30,7 @@ val xAxis: XAxis = this.xAxis xAxis.textColor = R.color.mainTextColor.convertColor() xAxis.textSize = 10f + xAxis.setLabelCount(7, true) xAxis.setDrawLabels(true) //绘制标签 指x轴上的对应数值 xAxis.setDrawAxisLine(true) //是否绘制轴线 xAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt index 0644cff..cd6f75c 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt @@ -30,6 +30,7 @@ val xAxis: XAxis = this.xAxis xAxis.textColor = R.color.mainTextColor.convertColor() xAxis.textSize = 10f + xAxis.setLabelCount(7, true) xAxis.setDrawLabels(true) //绘制标签 指x轴上的对应数值 xAxis.setDrawAxisLine(true) //是否绘制轴线 xAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 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 96c23a1..fbc636e 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 @@ -54,7 +54,6 @@ private lateinit var loginViewModel: LoginViewModel private lateinit var waterViewModel: WaterStatisticsViewModel private lateinit var changePwdViewModel: ChangePasswordViewModel - private val xAxisDate: MutableList = ArrayList() private val entryModels: MutableList = ArrayList() private var imageModels: MutableList = ArrayList() @@ -180,10 +179,11 @@ waterViewModel.waterCountByDay(Constant.AREA_ID, startDate, endDate) waterViewModel.dayDataModel.observe(this, { if (it.code == 200) { + val xAxisLabel: MutableList = ArrayList() val dataModel = it.data!! dataModel.forEach { dateModel -> val split = dateModel.date.toString().split("-") - xAxisDate.add("${split[1]}/${split[2]}") + xAxisLabel.add("${split[1]}/${split[2]}") } //确定有几条折线 val lines = dataModel[0].data?.size!! @@ -204,7 +204,7 @@ entryModel.entryList = entries entryModels.add(entryModel) } - ChartViewHelper.setLineChartData(waterLineChart, xAxisDate, entryModels) + ChartViewHelper.setLineChartData(waterLineChart, xAxisLabel, entryModels) } }) diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt index 0644cff..cd6f75c 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/LineChart.kt @@ -30,6 +30,7 @@ val xAxis: XAxis = this.xAxis xAxis.textColor = R.color.mainTextColor.convertColor() xAxis.textSize = 10f + xAxis.setLabelCount(7, true) xAxis.setDrawLabels(true) //绘制标签 指x轴上的对应数值 xAxis.setDrawAxisLine(true) //是否绘制轴线 xAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 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 96c23a1..fbc636e 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 @@ -54,7 +54,6 @@ private lateinit var loginViewModel: LoginViewModel private lateinit var waterViewModel: WaterStatisticsViewModel private lateinit var changePwdViewModel: ChangePasswordViewModel - private val xAxisDate: MutableList = ArrayList() private val entryModels: MutableList = ArrayList() private var imageModels: MutableList = ArrayList() @@ -180,10 +179,11 @@ waterViewModel.waterCountByDay(Constant.AREA_ID, startDate, endDate) waterViewModel.dayDataModel.observe(this, { if (it.code == 200) { + val xAxisLabel: MutableList = ArrayList() val dataModel = it.data!! dataModel.forEach { dateModel -> val split = dateModel.date.toString().split("-") - xAxisDate.add("${split[1]}/${split[2]}") + xAxisLabel.add("${split[1]}/${split[2]}") } //确定有几条折线 val lines = dataModel[0].data?.size!! @@ -204,7 +204,7 @@ entryModel.entryList = entries entryModels.add(entryModel) } - ChartViewHelper.setLineChartData(waterLineChart, xAxisDate, entryModels) + ChartViewHelper.setLineChartData(waterLineChart, xAxisLabel, entryModels) } }) diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WaterExpandedActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WaterExpandedActivity.kt index 7a63dea..ad93429 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WaterExpandedActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WaterExpandedActivity.kt @@ -21,6 +21,7 @@ class WaterExpandedActivity : BaseActivity() { + private val kTag = "WaterExpandedActivity" private val context: Context = this@WaterExpandedActivity private lateinit var waterViewModel: WaterStatisticsViewModel @@ -116,13 +117,13 @@ } waterViewModel.dayDataModel.observe(this, { if (it.code == 200) { - val xAxisDate: MutableList = ArrayList() + val xAxisLabel: MutableList = ArrayList() val entryModels: MutableList = ArrayList() val dataModel = it.data!! dataModel.forEach { dateModel -> val split = dateModel.date.toString().split("-") - xAxisDate.add("${split[1]}/${split[2]}") + xAxisLabel.add("${split[1]}/${split[2]}") } //确定有几条折线 val lines = dataModel[0].data?.size!! @@ -143,7 +144,7 @@ entryModel.entryList = entries entryModels.add(entryModel) } - ChartViewHelper.setLineChartData(waterLineChart, xAxisDate, entryModels) + ChartViewHelper.setLineChartData(waterLineChart, xAxisLabel, entryModels) } }) }