diff --git a/app/src/main/java/com/casic/smarttube/extensions/LineChart.kt b/app/src/main/java/com/casic/smarttube/extensions/LineChart.kt index 65af8cb..82996e8 100644 --- a/app/src/main/java/com/casic/smarttube/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/smarttube/extensions/LineChart.kt @@ -5,7 +5,6 @@ import com.github.mikephil.charting.animation.Easing import com.github.mikephil.charting.charts.Chart import com.github.mikephil.charting.charts.LineChart -import com.github.mikephil.charting.components.Legend import com.github.mikephil.charting.components.XAxis import com.github.mikephil.charting.components.YAxis import com.pengxh.kt.lite.extensions.convertColor @@ -24,6 +23,7 @@ rightAxis.isEnabled = false val leftAxis: YAxis = this.axisLeft leftAxis.axisMinimum = 0f + leftAxis.axisMaximum = 100f this.isScaleXEnabled = true //X轴可缩放 this.isScaleYEnabled = false //Y轴不可缩放 //设置x轴 @@ -36,14 +36,10 @@ xAxis.setDrawGridLines(true) //设置x轴上每个点对应的线 xAxis.granularity = 1f //禁止放大后x轴标签重绘 xAxis.position = XAxis.XAxisPosition.BOTTOM + xAxis.labelRotationAngle = -45f this.extraBottomOffset = 5f //解决X轴显示不完全问题 //去掉描述 this.description.isEnabled = false - //设置图例 - val legend = this.legend - legend.orientation = Legend.LegendOrientation.HORIZONTAL - legend.verticalAlignment = Legend.LegendVerticalAlignment.BOTTOM - legend.horizontalAlignment = Legend.LegendHorizontalAlignment.CENTER - //图例是否自动换行 - legend.isWordWrapEnabled = true + //去掉图例 + this.legend.isEnabled = false } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/extensions/LineChart.kt b/app/src/main/java/com/casic/smarttube/extensions/LineChart.kt index 65af8cb..82996e8 100644 --- a/app/src/main/java/com/casic/smarttube/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/smarttube/extensions/LineChart.kt @@ -5,7 +5,6 @@ import com.github.mikephil.charting.animation.Easing import com.github.mikephil.charting.charts.Chart import com.github.mikephil.charting.charts.LineChart -import com.github.mikephil.charting.components.Legend import com.github.mikephil.charting.components.XAxis import com.github.mikephil.charting.components.YAxis import com.pengxh.kt.lite.extensions.convertColor @@ -24,6 +23,7 @@ rightAxis.isEnabled = false val leftAxis: YAxis = this.axisLeft leftAxis.axisMinimum = 0f + leftAxis.axisMaximum = 100f this.isScaleXEnabled = true //X轴可缩放 this.isScaleYEnabled = false //Y轴不可缩放 //设置x轴 @@ -36,14 +36,10 @@ xAxis.setDrawGridLines(true) //设置x轴上每个点对应的线 xAxis.granularity = 1f //禁止放大后x轴标签重绘 xAxis.position = XAxis.XAxisPosition.BOTTOM + xAxis.labelRotationAngle = -45f this.extraBottomOffset = 5f //解决X轴显示不完全问题 //去掉描述 this.description.isEnabled = false - //设置图例 - val legend = this.legend - legend.orientation = Legend.LegendOrientation.HORIZONTAL - legend.verticalAlignment = Legend.LegendVerticalAlignment.BOTTOM - legend.horizontalAlignment = Legend.LegendHorizontalAlignment.CENTER - //图例是否自动换行 - legend.isWordWrapEnabled = true + //去掉图例 + this.legend.isEnabled = false } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_history_data.xml b/app/src/main/res/layout/activity_history_data.xml index f6fd64d..a2a3442 100644 --- a/app/src/main/res/layout/activity_history_data.xml +++ b/app/src/main/res/layout/activity_history_data.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:paddingVertical="@dimen/dp_10" - android:text="历史数据" + android:text="浓度历史数据" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_16" />