diff --git a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt index 0c45b69..196dafa 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt @@ -9,7 +9,7 @@ import com.pengxh.kt.lite.extensions.dp2px fun LineChart.initConfig() { - this.setNoDataText("无数据,无法渲染...") + this.setNoDataText("无数据,无法绘制浓度趋势...") this.setNoDataTextColor(Color.RED) this.getPaint(Chart.PAINT_INFO).textSize = 12f.dp2px(this.context) this.setDrawGridBackground(false) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt index 0c45b69..196dafa 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt @@ -9,7 +9,7 @@ import com.pengxh.kt.lite.extensions.dp2px fun LineChart.initConfig() { - this.setNoDataText("无数据,无法渲染...") + this.setNoDataText("无数据,无法绘制浓度趋势...") this.setNoDataTextColor(Color.RED) this.getPaint(Chart.PAINT_INFO).textSize = 12f.dp2px(this.context) this.setDrawGridBackground(false) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt index dc238d1..edf390b 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt @@ -51,8 +51,6 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) - //圆滑曲线 -// dataSet.mode = LineDataSet.Mode.CUBIC_BEZIER val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt index 0c45b69..196dafa 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt @@ -9,7 +9,7 @@ import com.pengxh.kt.lite.extensions.dp2px fun LineChart.initConfig() { - this.setNoDataText("无数据,无法渲染...") + this.setNoDataText("无数据,无法绘制浓度趋势...") this.setNoDataTextColor(Color.RED) this.getPaint(Chart.PAINT_INFO).textSize = 12f.dp2px(this.context) this.setDrawGridBackground(false) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt index dc238d1..edf390b 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt @@ -51,8 +51,6 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) - //圆滑曲线 -// dataSet.mode = LineDataSet.Mode.CUBIC_BEZIER val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c92b010..0eca321 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -36,7 +36,7 @@ app:tabMode="fixed" app:tabSelectedTextColor="@color/mainThemeColor" /> - diff --git a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt index 0c45b69..196dafa 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt @@ -9,7 +9,7 @@ import com.pengxh.kt.lite.extensions.dp2px fun LineChart.initConfig() { - this.setNoDataText("无数据,无法渲染...") + this.setNoDataText("无数据,无法绘制浓度趋势...") this.setNoDataTextColor(Color.RED) this.getPaint(Chart.PAINT_INFO).textSize = 12f.dp2px(this.context) this.setDrawGridBackground(false) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt index dc238d1..edf390b 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt @@ -51,8 +51,6 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) - //圆滑曲线 -// dataSet.mode = LineDataSet.Mode.CUBIC_BEZIER val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c92b010..0eca321 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -36,7 +36,7 @@ app:tabMode="fixed" app:tabSelectedTextColor="@color/mainThemeColor" /> - diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index f31f821..28b904f 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -137,7 +137,7 @@ android:background="@color/white" android:gravity="center" android:paddingVertical="@dimen/dp_10" - android:text="当前燃气浓度:0% VOL" + android:text="当前燃气浓度:--" android:textColor="@color/black" android:textSize="@dimen/sp_16" />