diff --git a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt index 2b59bef..7fbbf1d 100644 --- a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt @@ -26,13 +26,13 @@ rightAxis.isEnabled = false val leftAxis: YAxis = this.axisLeft leftAxis.axisMinimum = 0f - leftAxis.setDrawGridLines(true) //设置x轴上每个点对应的线 + leftAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 leftAxis.setDrawZeroLine(true) //添加限制线 val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, "1000") as String - val limitLine = LimitLine(threshold.toFloat(), "阈值:${threshold}ppm·m") + val limitLine = LimitLine(threshold.toFloat(), "阈值:${threshold}ppm·m") limitLine.lineWidth = 1f - limitLine.lineColor = Color.GREEN + limitLine.lineColor = Color.RED //允许在虚线模式下绘制(线段长度,分隔长度,偏移量) limitLine.enableDashedLine(10f, 10f, 0f) //设置限制线标签的位置 @@ -54,7 +54,7 @@ xAxis.textSize = 10f xAxis.setDrawLabels(true) //绘制标签 指x轴上的对应数值 xAxis.setDrawAxisLine(true) //是否绘制轴线 - xAxis.setDrawGridLines(true) //设置x轴上每个点对应的线 + xAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 xAxis.granularity = 1f //禁止放大后x轴标签重绘 xAxis.position = XAxis.XAxisPosition.BOTTOM this.extraTopOffset = 20f diff --git a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt index 2b59bef..7fbbf1d 100644 --- a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt @@ -26,13 +26,13 @@ rightAxis.isEnabled = false val leftAxis: YAxis = this.axisLeft leftAxis.axisMinimum = 0f - leftAxis.setDrawGridLines(true) //设置x轴上每个点对应的线 + leftAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 leftAxis.setDrawZeroLine(true) //添加限制线 val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, "1000") as String - val limitLine = LimitLine(threshold.toFloat(), "阈值:${threshold}ppm·m") + val limitLine = LimitLine(threshold.toFloat(), "阈值:${threshold}ppm·m") limitLine.lineWidth = 1f - limitLine.lineColor = Color.GREEN + limitLine.lineColor = Color.RED //允许在虚线模式下绘制(线段长度,分隔长度,偏移量) limitLine.enableDashedLine(10f, 10f, 0f) //设置限制线标签的位置 @@ -54,7 +54,7 @@ xAxis.textSize = 10f xAxis.setDrawLabels(true) //绘制标签 指x轴上的对应数值 xAxis.setDrawAxisLine(true) //是否绘制轴线 - xAxis.setDrawGridLines(true) //设置x轴上每个点对应的线 + xAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 xAxis.granularity = 1f //禁止放大后x轴标签重绘 xAxis.position = XAxis.XAxisPosition.BOTTOM this.extraTopOffset = 20f diff --git a/app/src/main/java/com/casic/br/ktd/model/ChartPointModel.kt b/app/src/main/java/com/casic/br/ktd/model/ChartPointModel.kt deleted file mode 100644 index 0a6a8fd..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/ChartPointModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.br.ktd.model - -data class ChartPointModel(var dataTime: String, var dataValue: Int) diff --git a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt index 2b59bef..7fbbf1d 100644 --- a/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/br/ktd/extensions/LineChart.kt @@ -26,13 +26,13 @@ rightAxis.isEnabled = false val leftAxis: YAxis = this.axisLeft leftAxis.axisMinimum = 0f - leftAxis.setDrawGridLines(true) //设置x轴上每个点对应的线 + leftAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 leftAxis.setDrawZeroLine(true) //添加限制线 val threshold = SaveKeyValues.getValue(LocaleConstant.ALARM_THRESHOLD, "1000") as String - val limitLine = LimitLine(threshold.toFloat(), "阈值:${threshold}ppm·m") + val limitLine = LimitLine(threshold.toFloat(), "阈值:${threshold}ppm·m") limitLine.lineWidth = 1f - limitLine.lineColor = Color.GREEN + limitLine.lineColor = Color.RED //允许在虚线模式下绘制(线段长度,分隔长度,偏移量) limitLine.enableDashedLine(10f, 10f, 0f) //设置限制线标签的位置 @@ -54,7 +54,7 @@ xAxis.textSize = 10f xAxis.setDrawLabels(true) //绘制标签 指x轴上的对应数值 xAxis.setDrawAxisLine(true) //是否绘制轴线 - xAxis.setDrawGridLines(true) //设置x轴上每个点对应的线 + xAxis.setDrawGridLines(false) //设置x轴上每个点对应的线 xAxis.granularity = 1f //禁止放大后x轴标签重绘 xAxis.position = XAxis.XAxisPosition.BOTTOM this.extraTopOffset = 20f diff --git a/app/src/main/java/com/casic/br/ktd/model/ChartPointModel.kt b/app/src/main/java/com/casic/br/ktd/model/ChartPointModel.kt deleted file mode 100644 index 0a6a8fd..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/ChartPointModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.br.ktd.model - -data class ChartPointModel(var dataTime: String, var dataValue: Int) diff --git a/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt index 3ac19a6..f699c65 100644 --- a/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/ktd/utils/LocaleConstant.kt @@ -33,7 +33,7 @@ * ============================================================================================= * */ //数据接收频率 - const val DATA_TIMER_PERIOD = 2000L + const val DATA_TIMER_PERIOD = 1000L /** * =============================================================================================