zhangxn
/
puwei
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desc:气体单位再修改

Browse Source
main
xiaowusky 1 year ago
parent 55c9afeed2
commit bfa2c198bc
4 changed files with 85 additions and 50 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasConstants.kt
Unescape Escape View File

@ -117,7 +117,7 @@ val default_threshold_map_mgm3 = hashMapOf(
val default_threshold_map_unit = hashMapOf(
Pair(UNIT_PPM, default_threshold_map_ppm),
Pair(UNIT_MGM3, default_threshold_map_mgm3),
// Pair(UNIT_MGM3, default_threshold_map_mgm3),
)

44
app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt
Unescape Escape View File

@ -85,18 +85,18 @@ fun getGasLowThreshold(gasType: String, unit: String): Float {
} else if (VOCS == gasType) {
return VOCS_MIN_PPM
}
return (default_threshold_map_unit[unit])?.get(lowThresholdKey) ?: -1f
return (default_threshold_map_unit[UNIT_PPM])?.get(lowThresholdKey) ?: -1f
} else {
// 氧气 可燃气体 和 挥发气体不转换数值
if (O2 == gasType || CH4_H2 == gasType || VOCS == gasType) {
return localVlaue
}
if (UNIT_MGM3 == unit) {
val typeEnum = getGasTypeEnumByDesc(gasType)
if (typeEnum.molecular > 0) {
localVlaue = ppm2mgm3(localVlaue, typeEnum.molecular)
}
}
// // 氧气 可燃气体 和 挥发气体不转换数值
// if (O2 == gasType || CH4_H2 == gasType || VOCS == gasType) {
// return localVlaue
// }
// if (UNIT_MGM3 == unit) {
// val typeEnum = getGasTypeEnumByDesc(gasType)
// if (typeEnum.molecular > 0) {
// localVlaue = ppm2mgm3(localVlaue, typeEnum.molecular)
// }
// }
return localVlaue
}
}
@ -117,18 +117,18 @@ fun getGasHighThreshold(gasType: String, unit: String): Float {
} else if (VOCS == gasType) {
return VOCS_MAX_PPM
}
return (default_threshold_map_unit[unit])?.get(highThresholdKey) ?: -1f
return (default_threshold_map_unit[UNIT_PPM])?.get(highThresholdKey) ?: -1f
} else {
// 氧气 可燃气体 和 挥发气体不转换数值
if (O2 == gasType || CH4_H2 == gasType || VOCS == gasType) {
return localVlaue
}
if (UNIT_MGM3 == unit) {
val typeEnum = getGasTypeEnumByDesc(gasType)
if (typeEnum.molecular > 0) {
localVlaue = ppm2mgm3(localVlaue, typeEnum.molecular)
}
}
// // 氧气 可燃气体 和 挥发气体不转换数值
// if (O2 == gasType || CH4_H2 == gasType || VOCS == gasType) {
// return localVlaue
// }
// if (UNIT_MGM3 == unit) {
// val typeEnum = getGasTypeEnumByDesc(gasType)
// if (typeEnum.molecular > 0) {
// localVlaue = ppm2mgm3(localVlaue, typeEnum.molecular)
// }
// }
return localVlaue
}
}

63
app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt
Unescape Escape View File

@ -13,8 +13,10 @@ import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
import com.yinuo.safetywatcher.watcher.port.GasCache
import com.yinuo.safetywatcher.watcher.port.GasPortUtils
import com.yinuo.safetywatcher.watcher.port.ParseHelper
import com.yinuo.safetywatcher.watcher.port.UNIT_LEL
import com.yinuo.safetywatcher.watcher.port.UNIT_MGM3
import com.yinuo.safetywatcher.watcher.port.UNIT_PPM
import com.yinuo.safetywatcher.watcher.port.UNIT_VOL
import com.yinuo.safetywatcher.watcher.port.cmd.CH4_H2
import com.yinuo.safetywatcher.watcher.port.cmd.O2
import com.yinuo.safetywatcher.watcher.port.cmd.VOCS
@ -48,32 +50,38 @@ class SensorSettingActivity : NoOptionsActivity() {
gasName = intent.getStringExtra("GasType")!!
sensorIndex = intent.getIntExtra("index", -1)
val localGasUnit = getLocalGasUnit(gasName)
// 氧气单位固定
if (gasName == O2) {
mBinding.rgUnit.visibility = View.GONE
mBinding.rbLel.visibility = View.GONE
mBinding.rbVol.visibility = View.VISIBLE
// // 氧气单位固定
// if (gasName == O2) {
// mBinding.rgUnit.visibility = View.GONE
// mBinding.rbLel.visibility = View.GONE
// mBinding.rbVol.visibility = View.VISIBLE
// showRbView = mBinding.rbVol
// } else if (gasName == CH4_H2) {
// mBinding.rgUnit.visibility = View.GONE
// mBinding.rbVol.visibility = View.GONE
// mBinding.rbLel.visibility = View.VISIBLE
// showRbView = mBinding.rbLel
// } else {
mBinding.rgUnit.visibility = View.VISIBLE
// mBinding.rbVol.visibility = View.GONE
// mBinding.rbLel.visibility = View.GONE
// if (gasName == VOCS) {
// mBinding.rbMgm3.visibility = View.GONE
// }
if (localGasUnit == UNIT_PPM) {
mBinding.rbPpm.isChecked = true
showRbView = mBinding.rbPpm
} else if (localGasUnit == UNIT_VOL) {
mBinding.rbVol.isChecked = true
showRbView = mBinding.rbVol
} else if (gasName == CH4_H2) {
mBinding.rgUnit.visibility = View.GONE
mBinding.rbVol.visibility = View.GONE
mBinding.rbLel.visibility = View.VISIBLE
} else if (localGasUnit == UNIT_LEL) {
mBinding.rbLel.isChecked = true
showRbView = mBinding.rbLel
} else {
mBinding.rgUnit.visibility = View.VISIBLE
mBinding.rbVol.visibility = View.GONE
mBinding.rbLel.visibility = View.GONE
if (gasName == VOCS) {
mBinding.rbMgm3.visibility = View.GONE
}
if (localGasUnit == UNIT_PPM) {
mBinding.rbPpm.isChecked = true
showRbView = mBinding.rbPpm
} else {
mBinding.rbMgm3.isChecked = true
showRbView = mBinding.rbMgm3
}
mBinding.rbMgm3.isChecked = true
showRbView = mBinding.rbMgm3
}
// }
// 昵称和量程
lifecycleScope.launch(Dispatchers.IO) {
@ -88,7 +96,7 @@ class SensorSettingActivity : NoOptionsActivity() {
}
val gasRange = ParseHelper.getGasRangeMax(gasName)
// mBinding.etStep.text = getString(R.string.sensor_step_txt).plus(": $gasRange")
mBinding.etStep.hint = "最大量程：$gasRange $localGasUnit"
mBinding.etStep.hint = "量程：$gasRange $localGasUnit"
mBinding.etGasName.hint = "气体名称：$gasNickName"
}
}
@ -257,18 +265,23 @@ class SensorSettingActivity : NoOptionsActivity() {
if (rangeStr.isNotEmpty()) {
val toInt = rangeStr.toInt()
if (toInt <= 0) {
showToast("最大量程必须大于0！")
showToast("量程必须大于0！")
} else {
GasPortUtils.setSensorMaxRange(sensorIndex, toInt)
}
}
// if (gasName != O2 && gasName != CH4_H2) {
val checkedRadioButtonId = mBinding.rgUnit.checkedRadioButtonId
var selectedUnit = UNIT_PPM
if (checkedRadioButtonId == R.id.rb_mgm3) {
selectedUnit = UNIT_MGM3
} else if (checkedRadioButtonId == R.id.rb_vol) {
selectedUnit = UNIT_VOL
} else if (checkedRadioButtonId == R.id.rb_lel) {
selectedUnit = UNIT_LEL
}
saveGasUnit(gasName, selectedUnit)
// }
showToast("保存成功")
}
}

26
app/src/main/res/layout/activity_sensor_setting.xml
Unescape Escape View File

@ -92,7 +92,7 @@
android:textColor="@color/white"
android:textSize="@dimen/_30dp" />
<androidx.appcompat.widget.AppCompatRadioButton
<!--<androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/rb_vol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -116,7 +116,7 @@
android:paddingHorizontal="@dimen/_6dp"
android:text="@string/unit_lel"
android:textColor="@color/white"
android:textSize="@dimen/_28dp" />
android:textSize="@dimen/_28dp" />-->
<RadioGroup
android:id="@+id/rg_unit"
@ -136,6 +136,28 @@
android:textColor="@color/white"
android:textSize="@dimen/_28dp" />
<androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/rb_vol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="true"
android:paddingHorizontal="@dimen/_6dp"
android:layout_marginStart="@dimen/_40dp"
android:text="@string/unit_vol"
android:textColor="@color/white"
android:textSize="@dimen/_28dp" />
<androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/rb_lel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="true"
android:paddingHorizontal="@dimen/_6dp"
android:layout_marginStart="@dimen/_40dp"
android:text="@string/unit_lel"
android:textColor="@color/white"
android:textSize="@dimen/_28dp" />
<androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/rb_mgm3"
android:layout_width="wrap_content"

Write Preview
Loading…
Cancel
Save