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 1f5aab8..5025b55 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 @@ -1,6 +1,7 @@ package com.casic.qd.smartwell.extensions import com.casic.qd.smartwell.R +import com.github.mikephil.charting.animation.Easing import com.github.mikephil.charting.charts.LineChart import com.github.mikephil.charting.components.Legend import com.github.mikephil.charting.components.XAxis @@ -9,6 +10,7 @@ fun LineChart.init() { this.setDrawGridBackground(false) this.setDrawBorders(false) + this.animateY(1200, Easing.EaseInOutQuad) //设置样式 val rightAxis: YAxis = this.axisRight //设置图表右边的y轴禁用 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 1f5aab8..5025b55 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 @@ -1,6 +1,7 @@ package com.casic.qd.smartwell.extensions import com.casic.qd.smartwell.R +import com.github.mikephil.charting.animation.Easing import com.github.mikephil.charting.charts.LineChart import com.github.mikephil.charting.components.Legend import com.github.mikephil.charting.components.XAxis @@ -9,6 +10,7 @@ fun LineChart.init() { this.setDrawGridBackground(false) this.setDrawBorders(false) + this.animateY(1200, Easing.EaseInOutQuad) //设置样式 val rightAxis: YAxis = this.axisRight //设置图表右边的y轴禁用 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 ae2531b..ad61a8d 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 @@ -5,7 +5,6 @@ import android.os.Handler import android.os.Looper import android.os.Message -import android.util.Log import android.view.KeyEvent import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.GridLayoutManager @@ -157,7 +156,6 @@ entryModel.entryList = entries entryModels.add(entryModel) } - Log.d(kTag, entryModels.toJson()) ChartViewHelper.setLineChartData(waterLineChart, xAxisDate, 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 1f5aab8..5025b55 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 @@ -1,6 +1,7 @@ package com.casic.qd.smartwell.extensions import com.casic.qd.smartwell.R +import com.github.mikephil.charting.animation.Easing import com.github.mikephil.charting.charts.LineChart import com.github.mikephil.charting.components.Legend import com.github.mikephil.charting.components.XAxis @@ -9,6 +10,7 @@ fun LineChart.init() { this.setDrawGridBackground(false) this.setDrawBorders(false) + this.animateY(1200, Easing.EaseInOutQuad) //设置样式 val rightAxis: YAxis = this.axisRight //设置图表右边的y轴禁用 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 ae2531b..ad61a8d 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 @@ -5,7 +5,6 @@ import android.os.Handler import android.os.Looper import android.os.Message -import android.util.Log import android.view.KeyEvent import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.GridLayoutManager @@ -157,7 +156,6 @@ entryModel.entryList = entries entryModels.add(entryModel) } - Log.d(kTag, entryModels.toJson()) ChartViewHelper.setLineChartData(waterLineChart, xAxisDate, entryModels) } }) diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index 1924bce..bb66c3f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -169,6 +169,7 @@ clearButton.setOnClickListener { alarmTypeView.text = "" alarmContentView.text = "" + areaView.text = "" startTimeView.text = "" endTimeView.text = "" }