diff --git a/app/.gitignore b/app/.gitignore index 956c004..feae677 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,2 +1,3 @@ /build -/release \ No newline at end of file +/release +/old \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore index 956c004..feae677 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,2 +1,3 @@ /build -/release \ No newline at end of file +/release +/old \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index b5ad31e..93ab834 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.app.safetreecontroller" minSdkVersion 23 targetSdkVersion 33 - versionCode 1000 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" ndk { abiFilters "arm64-v8a", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/.gitignore b/app/.gitignore index 956c004..feae677 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,2 +1,3 @@ /build -/release \ No newline at end of file +/release +/old \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index b5ad31e..93ab834 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.app.safetreecontroller" minSdkVersion 23 targetSdkVersion 33 - versionCode 1000 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" ndk { abiFilters "arm64-v8a", "armeabi-v7a", "x86_64", "x86" } 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 bb3bb5b..4d3f9c1 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 @@ -32,8 +32,8 @@ this.axisLeft.setDrawGridLines(false) //设置x轴上每个点对应的线 this.axisLeft.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 0.1) - val limitLine = LimitLine(threshold.toString().toFloat(), "阈值:${threshold}%VOL") + val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 2) + val limitLine = LimitLine(threshold.toString().toFloat(), "阈值:${threshold}%LEL") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED //允许在虚线模式下绘制(线段长度,分隔长度,偏移量) diff --git a/app/.gitignore b/app/.gitignore index 956c004..feae677 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,2 +1,3 @@ /build -/release \ No newline at end of file +/release +/old \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index b5ad31e..93ab834 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.app.safetreecontroller" minSdkVersion 23 targetSdkVersion 33 - versionCode 1000 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" ndk { abiFilters "arm64-v8a", "armeabi-v7a", "x86_64", "x86" } 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 bb3bb5b..4d3f9c1 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 @@ -32,8 +32,8 @@ this.axisLeft.setDrawGridLines(false) //设置x轴上每个点对应的线 this.axisLeft.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 0.1) - val limitLine = LimitLine(threshold.toString().toFloat(), "阈值:${threshold}%VOL") + val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 2) + val limitLine = LimitLine(threshold.toString().toFloat(), "阈值:${threshold}%LEL") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED //允许在虚线模式下绘制(线段长度,分隔长度,偏移量) 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 1889d9b..0bfdbb9 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 @@ -121,8 +121,8 @@ binding.updateThresholdButton.setOnClickListener { //更新甲烷阈值 val threshold = binding.thresholdView.text.toString().toFloat() - if (threshold > 10f) { - "报警阈值不能超过10%VOL".show(requireContext()) + if (threshold >= 200f) { + "报警阈值不能超过200%LEL".show(requireContext()) return@setOnClickListener } @@ -187,10 +187,10 @@ LocaleConstant.QUERY_METHANE_RESPONSE_CODE -> { val ppm = msg.obj as Long - //通常,对于气体在空气中的浓度,我们可以认为10000ppm大约等于1%VOL - val formatValue = "%.2f".format(ppm / 10000f) - binding.currentGasValueView.text = "当前燃气浓度:${formatValue}%VOL" - if (ppm > binding.thresholdView.text.toString().toFloat() * 10000) { + //通常,对于气体在空气中的浓度,我们可以认为100000ppm大约等于200%LEL + val formatValue = "%.2f".format(ppm / 500f) + binding.currentGasValueView.text = "当前燃气浓度:${formatValue}%LEL" + if (ppm > binding.thresholdView.text.toString().toFloat() * 500) { binding.currentGasValueView.setTextColor(Color.RED) binding.currentGasValueView.typeface = Typeface.DEFAULT_BOLD } else { diff --git a/app/.gitignore b/app/.gitignore index 956c004..feae677 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,2 +1,3 @@ /build -/release \ No newline at end of file +/release +/old \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index b5ad31e..93ab834 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.app.safetreecontroller" minSdkVersion 23 targetSdkVersion 33 - versionCode 1000 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" ndk { abiFilters "arm64-v8a", "armeabi-v7a", "x86_64", "x86" } 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 bb3bb5b..4d3f9c1 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 @@ -32,8 +32,8 @@ this.axisLeft.setDrawGridLines(false) //设置x轴上每个点对应的线 this.axisLeft.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 0.1) - val limitLine = LimitLine(threshold.toString().toFloat(), "阈值:${threshold}%VOL") + val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 2) + val limitLine = LimitLine(threshold.toString().toFloat(), "阈值:${threshold}%LEL") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED //允许在虚线模式下绘制(线段长度,分隔长度,偏移量) 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 1889d9b..0bfdbb9 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 @@ -121,8 +121,8 @@ binding.updateThresholdButton.setOnClickListener { //更新甲烷阈值 val threshold = binding.thresholdView.text.toString().toFloat() - if (threshold > 10f) { - "报警阈值不能超过10%VOL".show(requireContext()) + if (threshold >= 200f) { + "报警阈值不能超过200%LEL".show(requireContext()) return@setOnClickListener } @@ -187,10 +187,10 @@ LocaleConstant.QUERY_METHANE_RESPONSE_CODE -> { val ppm = msg.obj as Long - //通常,对于气体在空气中的浓度,我们可以认为10000ppm大约等于1%VOL - val formatValue = "%.2f".format(ppm / 10000f) - binding.currentGasValueView.text = "当前燃气浓度:${formatValue}%VOL" - if (ppm > binding.thresholdView.text.toString().toFloat() * 10000) { + //通常,对于气体在空气中的浓度,我们可以认为100000ppm大约等于200%LEL + val formatValue = "%.2f".format(ppm / 500f) + binding.currentGasValueView.text = "当前燃气浓度:${formatValue}%LEL" + if (ppm > binding.thresholdView.text.toString().toFloat() * 500) { binding.currentGasValueView.setTextColor(Color.RED) binding.currentGasValueView.typeface = Typeface.DEFAULT_BOLD } else { diff --git a/app/src/main/res/layout/fragment_base_settings.xml b/app/src/main/res/layout/fragment_base_settings.xml index a8dd188..3ecf7f5 100644 --- a/app/src/main/res/layout/fragment_base_settings.xml +++ b/app/src/main/res/layout/fragment_base_settings.xml @@ -177,7 +177,6 @@ android:inputType="textPassword" android:padding="@dimen/dp_5" android:singleLine="true" - android:text="zhsz20311hw" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/.gitignore b/app/.gitignore index 956c004..feae677 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,2 +1,3 @@ /build -/release \ No newline at end of file +/release +/old \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index b5ad31e..93ab834 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.app.safetreecontroller" minSdkVersion 23 targetSdkVersion 33 - versionCode 1000 - versionName "1.0.0.0" + versionCode 1001 + versionName "1.0.0.1" ndk { abiFilters "arm64-v8a", "armeabi-v7a", "x86_64", "x86" } 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 bb3bb5b..4d3f9c1 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 @@ -32,8 +32,8 @@ this.axisLeft.setDrawGridLines(false) //设置x轴上每个点对应的线 this.axisLeft.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 0.1) - val limitLine = LimitLine(threshold.toString().toFloat(), "阈值:${threshold}%VOL") + val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 2) + val limitLine = LimitLine(threshold.toString().toFloat(), "阈值:${threshold}%LEL") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED //允许在虚线模式下绘制(线段长度,分隔长度,偏移量) 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 1889d9b..0bfdbb9 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 @@ -121,8 +121,8 @@ binding.updateThresholdButton.setOnClickListener { //更新甲烷阈值 val threshold = binding.thresholdView.text.toString().toFloat() - if (threshold > 10f) { - "报警阈值不能超过10%VOL".show(requireContext()) + if (threshold >= 200f) { + "报警阈值不能超过200%LEL".show(requireContext()) return@setOnClickListener } @@ -187,10 +187,10 @@ LocaleConstant.QUERY_METHANE_RESPONSE_CODE -> { val ppm = msg.obj as Long - //通常,对于气体在空气中的浓度,我们可以认为10000ppm大约等于1%VOL - val formatValue = "%.2f".format(ppm / 10000f) - binding.currentGasValueView.text = "当前燃气浓度:${formatValue}%VOL" - if (ppm > binding.thresholdView.text.toString().toFloat() * 10000) { + //通常,对于气体在空气中的浓度,我们可以认为100000ppm大约等于200%LEL + val formatValue = "%.2f".format(ppm / 500f) + binding.currentGasValueView.text = "当前燃气浓度:${formatValue}%LEL" + if (ppm > binding.thresholdView.text.toString().toFloat() * 500) { binding.currentGasValueView.setTextColor(Color.RED) binding.currentGasValueView.typeface = Typeface.DEFAULT_BOLD } else { diff --git a/app/src/main/res/layout/fragment_base_settings.xml b/app/src/main/res/layout/fragment_base_settings.xml index a8dd188..3ecf7f5 100644 --- a/app/src/main/res/layout/fragment_base_settings.xml +++ b/app/src/main/res/layout/fragment_base_settings.xml @@ -177,7 +177,6 @@ android:inputType="textPassword" android:padding="@dimen/dp_5" android:singleLine="true" - android:text="zhsz20311hw" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index fd6d578..d6e0aac 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -83,7 +83,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_5" - android:text="% VOL" + android:text="% LEL" android:textColor="@color/black" android:textSize="11sp" />