diff --git a/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt b/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt index 8da82d8..0f7e183 100644 --- a/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt @@ -10,7 +10,4 @@ //折线颜色 var lineColor = R.color.mainThemeColor.convertColor() - - //点日期 - var entryDate: String? = null } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt b/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt index 8da82d8..0f7e183 100644 --- a/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt @@ -10,7 +10,4 @@ //折线颜色 var lineColor = R.color.mainThemeColor.convertColor() - - //点日期 - var entryDate: String? = null } \ 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 cca9306..a65c1c1 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 @@ -4,7 +4,6 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseApplication import com.casic.qd.smartwell.extensions.convertColor -import com.casic.qd.smartwell.extensions.formatDate import com.casic.qd.smartwell.model.LineChartEntryModel import com.casic.qd.smartwell.widgets.DetailsMarkerView import com.github.mikephil.charting.animation.Easing @@ -33,12 +32,13 @@ private const val kTag = "ChartViewHelper" private val decimalFormat = DecimalFormat("##0.00") - fun setLineChartData(chart: LineChart, entryModels: List) { + fun setLineChartData( + chart: LineChart, + xAxisDate: MutableList, + entryModels: List + ) { val lineDataSets: MutableList = ArrayList() - val xAxisDate: MutableList = ArrayList() entryModels.forEachIndexed { index, it -> - //格式化X轴日期 - xAxisDate.add(it.entryDate.toString().formatDate()) //设置数据 val dataSet = LineDataSet(it.entryList, it.entryList?.get(index)?.data.toString()) dataSet.setDrawCircles(true) diff --git a/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt b/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt index 8da82d8..0f7e183 100644 --- a/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt @@ -10,7 +10,4 @@ //折线颜色 var lineColor = R.color.mainThemeColor.convertColor() - - //点日期 - var entryDate: String? = null } \ 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 cca9306..a65c1c1 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 @@ -4,7 +4,6 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseApplication import com.casic.qd.smartwell.extensions.convertColor -import com.casic.qd.smartwell.extensions.formatDate import com.casic.qd.smartwell.model.LineChartEntryModel import com.casic.qd.smartwell.widgets.DetailsMarkerView import com.github.mikephil.charting.animation.Easing @@ -33,12 +32,13 @@ private const val kTag = "ChartViewHelper" private val decimalFormat = DecimalFormat("##0.00") - fun setLineChartData(chart: LineChart, entryModels: List) { + fun setLineChartData( + chart: LineChart, + xAxisDate: MutableList, + entryModels: List + ) { val lineDataSets: MutableList = ArrayList() - val xAxisDate: MutableList = ArrayList() entryModels.forEachIndexed { index, it -> - //格式化X轴日期 - xAxisDate.add(it.entryDate.toString().formatDate()) //设置数据 val dataSet = LineDataSet(it.entryList, it.entryList?.get(index)?.data.toString()) dataSet.setDrawCircles(true) diff --git a/app/src/main/java/com/casic/qd/smartwell/view/ExpandedActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/ExpandedActivity.kt index c91e1ce..4bb3e5f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/ExpandedActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/ExpandedActivity.kt @@ -21,6 +21,7 @@ private val kTag = "ExpandedActivity" private lateinit var waterViewModel: WaterStatisticsViewModel + private val xAxisDate: MutableList = ArrayList() private val entryModels: MutableList = ArrayList() private var startDate = "" @@ -96,6 +97,10 @@ waterViewModel.areaDataModel.observe(this, { if (it.code == 200) { val dataModel = it.data!! + dataModel.forEach { dateModel -> + val split = dateModel.date.toString().split("-") + xAxisDate.add("${split[1]}-${split[2]}") + } //确定有几条折线 val lines = dataModel[0].data?.size!! for (i in 0 until lines) { @@ -104,7 +109,6 @@ val entryModel = LineChartEntryModel() dataModel.forEachIndexed { j, dataBean -> entryModel.lineColor = Constant.COLORS[i].convertColor() - entryModel.entryDate = dataBean.date val areaData = dataBean.data!![i] entries.add( @@ -116,7 +120,7 @@ entryModel.entryList = entries entryModels.add(entryModel) } - ChartViewHelper.setLineChartData(waterLineChart, entryModels) + ChartViewHelper.setLineChartData(waterLineChart, xAxisDate, entryModels) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt b/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt index 8da82d8..0f7e183 100644 --- a/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/model/LineChartEntryModel.kt @@ -10,7 +10,4 @@ //折线颜色 var lineColor = R.color.mainThemeColor.convertColor() - - //点日期 - var entryDate: String? = null } \ 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 cca9306..a65c1c1 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 @@ -4,7 +4,6 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseApplication import com.casic.qd.smartwell.extensions.convertColor -import com.casic.qd.smartwell.extensions.formatDate import com.casic.qd.smartwell.model.LineChartEntryModel import com.casic.qd.smartwell.widgets.DetailsMarkerView import com.github.mikephil.charting.animation.Easing @@ -33,12 +32,13 @@ private const val kTag = "ChartViewHelper" private val decimalFormat = DecimalFormat("##0.00") - fun setLineChartData(chart: LineChart, entryModels: List) { + fun setLineChartData( + chart: LineChart, + xAxisDate: MutableList, + entryModels: List + ) { val lineDataSets: MutableList = ArrayList() - val xAxisDate: MutableList = ArrayList() entryModels.forEachIndexed { index, it -> - //格式化X轴日期 - xAxisDate.add(it.entryDate.toString().formatDate()) //设置数据 val dataSet = LineDataSet(it.entryList, it.entryList?.get(index)?.data.toString()) dataSet.setDrawCircles(true) diff --git a/app/src/main/java/com/casic/qd/smartwell/view/ExpandedActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/ExpandedActivity.kt index c91e1ce..4bb3e5f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/ExpandedActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/ExpandedActivity.kt @@ -21,6 +21,7 @@ private val kTag = "ExpandedActivity" private lateinit var waterViewModel: WaterStatisticsViewModel + private val xAxisDate: MutableList = ArrayList() private val entryModels: MutableList = ArrayList() private var startDate = "" @@ -96,6 +97,10 @@ waterViewModel.areaDataModel.observe(this, { if (it.code == 200) { val dataModel = it.data!! + dataModel.forEach { dateModel -> + val split = dateModel.date.toString().split("-") + xAxisDate.add("${split[1]}-${split[2]}") + } //确定有几条折线 val lines = dataModel[0].data?.size!! for (i in 0 until lines) { @@ -104,7 +109,6 @@ val entryModel = LineChartEntryModel() dataModel.forEachIndexed { j, dataBean -> entryModel.lineColor = Constant.COLORS[i].convertColor() - entryModel.entryDate = dataBean.date val areaData = dataBean.data!![i] entries.add( @@ -116,7 +120,7 @@ entryModel.entryList = entries entryModels.add(entryModel) } - ChartViewHelper.setLineChartData(waterLineChart, entryModels) + ChartViewHelper.setLineChartData(waterLineChart, xAxisDate, entryModels) } }) } 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 3104f25..d2ad38f 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 @@ -37,6 +37,7 @@ private val context: Context = this@MainActivity private var clickTime: Long = 0 private lateinit var waterViewModel: WaterStatisticsViewModel + private val xAxisDate: MutableList = ArrayList() private val entryModels: MutableList = ArrayList() private val imageUrls = listOf( "https://images.pexels.com/photos/1036808/pexels-photo-1036808.jpeg?auto=compress&cs=tinysrgb&dpr=1&w=500", @@ -125,9 +126,8 @@ //初始化折线图，X轴从0开始 val time = System.currentTimeMillis() - val startDate = time.timestampToLastMonthDate() // val startDate = time.timestampToLastWeekDate() -// val startDate = time.timestampToDate() + val startDate = time.timestampToDate() val endDate = time.timestampToDate() waterLineChart.init() //一周折线图数据 @@ -135,6 +135,10 @@ waterViewModel.areaDataModel.observe(this, { if (it.code == 200) { val dataModel = it.data!! + dataModel.forEach { dateModel -> + val split = dateModel.date.toString().split("-") + xAxisDate.add("${split[1]}-${split[2]}") + } //确定有几条折线 val lines = dataModel[0].data?.size!! for (i in 0 until lines) { @@ -143,7 +147,6 @@ val entryModel = LineChartEntryModel() dataModel.forEachIndexed { j, dataBean -> entryModel.lineColor = Constant.COLORS[i].convertColor() - entryModel.entryDate = dataBean.date val areaData = dataBean.data!![i] entries.add( @@ -156,7 +159,7 @@ entryModels.add(entryModel) } Log.d(kTag, entryModels.toJson()) - ChartViewHelper.setLineChartData(waterLineChart, entryModels) + ChartViewHelper.setLineChartData(waterLineChart, xAxisDate, entryModels) } })