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 51ea481..80a3b67 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 @@ -162,6 +162,13 @@ //LEL百分比 = (X / 10000) / 0.05 × 100% = X / 500 val formatValue = "%.2f".format(ppm / 500f) binding.currentGasValueView.text = "当前燃气浓度:${formatValue}% VOL" + if (ppm > binding.thresholdView.text.toString().toFloat() * 500) { + binding.currentGasValueView.setTextColor(Color.RED) + binding.currentGasValueView.typeface = Typeface.DEFAULT_BOLD + } else { + binding.currentGasValueView.setTextColor(Color.BLACK) + binding.currentGasValueView.typeface = Typeface.DEFAULT + } //折线图添加数据 xAxisLabels.add(System.currentTimeMillis().timestampToTime()) 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 51ea481..80a3b67 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 @@ -162,6 +162,13 @@ //LEL百分比 = (X / 10000) / 0.05 × 100% = X / 500 val formatValue = "%.2f".format(ppm / 500f) binding.currentGasValueView.text = "当前燃气浓度:${formatValue}% VOL" + if (ppm > binding.thresholdView.text.toString().toFloat() * 500) { + binding.currentGasValueView.setTextColor(Color.RED) + binding.currentGasValueView.typeface = Typeface.DEFAULT_BOLD + } else { + binding.currentGasValueView.setTextColor(Color.BLACK) + binding.currentGasValueView.typeface = Typeface.DEFAULT + } //折线图添加数据 xAxisLabels.add(System.currentTimeMillis().timestampToTime()) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 5736006..1601565 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -23,8 +23,8 @@ try { timeView.text = xAxisDate[(e.x).toInt()] valueView.text = "${"%.2f".format(e.y)}% VOL" - } catch (e1: Exception) { - e1.printStackTrace() + } catch (ex: Exception) { + ex.printStackTrace() } super.refreshContent(e, highlight) } 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 51ea481..80a3b67 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 @@ -162,6 +162,13 @@ //LEL百分比 = (X / 10000) / 0.05 × 100% = X / 500 val formatValue = "%.2f".format(ppm / 500f) binding.currentGasValueView.text = "当前燃气浓度:${formatValue}% VOL" + if (ppm > binding.thresholdView.text.toString().toFloat() * 500) { + binding.currentGasValueView.setTextColor(Color.RED) + binding.currentGasValueView.typeface = Typeface.DEFAULT_BOLD + } else { + binding.currentGasValueView.setTextColor(Color.BLACK) + binding.currentGasValueView.typeface = Typeface.DEFAULT + } //折线图添加数据 xAxisLabels.add(System.currentTimeMillis().timestampToTime()) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 5736006..1601565 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -23,8 +23,8 @@ try { timeView.text = xAxisDate[(e.x).toInt()] valueView.text = "${"%.2f".format(e.y)}% VOL" - } catch (e1: Exception) { - e1.printStackTrace() + } catch (ex: Exception) { + ex.printStackTrace() } super.refreshContent(e, highlight) } diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 423446a..990497e 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,7 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" - android:textColor="@color/red" + android:textColor="@color/black" android:textSize="@dimen/sp_16" />