smiuser/hpos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

1.baud rate is added,

Browse Source 
2. existing buffer popup is added,
3. submit button make visible
4.handlevalidresult function changes, added code for fetch ledbuffer1 to ledbuffer4 values and sample1 to sample4 values
This commit is contained in:
Mariya
2023-11-07 17:25:09 +05:30
parent 27949352dd
commit f37cfb57e1
1 changed files with 108 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
View File

@@ -79,9 +79,8 @@ class HemoCubeFragment : Fragment() {
binding.nameEditText.visibility = View.GONE binding.nameEditText.visibility = View.GONE
binding.tvTitle.visibility = View.GONE binding.tvTitle.visibility = View.GONE
binding.btnGo.visibility = View.GONE binding.btnGo.visibility = View.GONE
binding.btnSubmit.isEnabled = false binding.btnSubmit.isEnabled = true
binding.btnSubmit.isClickable = false binding.btnSubmit.isClickable = true
binding.tvName.text = "Name: ${testDetails?.name}\n ID: ${testDetails?._id}" binding.tvName.text = "Name: ${testDetails?.name}\n ID: ${testDetails?._id}"
Log.e("nametext", binding.tvName.text.toString()) Log.e("nametext", binding.tvName.text.toString())
@@ -104,7 +103,6 @@ class HemoCubeFragment : Fragment() {
binding.tvSubtitle4.visibility = View.VISIBLE binding.tvSubtitle4.visibility = View.VISIBLE
binding.tvSubtitle4.text = "Place Buffer" binding.tvSubtitle4.text = "Place Buffer"
} }
checkAndStartProcess() checkAndStartProcess()
it.visibility = View.GONE it.visibility = View.GONE
} }
@@ -264,7 +262,9 @@ class HemoCubeFragment : Fragment() {
} }
} }
stringData.contains("#SC") -> { stringData.contains("#SC") -> {
activity?.runOnUiThread {
binding.btnSubmit.visibility = View.VISIBLE binding.btnSubmit.visibility = View.VISIBLE
}
fetchResult() fetchResult()
testingTrace.stop() testingTrace.stop()
} }
@@ -351,38 +351,65 @@ class HemoCubeFragment : Fragment() {
private fun handleValidResult(validString: String, fullReadOutput: String) { private fun handleValidResult(validString: String, fullReadOutput: String) {
try { try {
val resultLines = validString.split("\n") val resultLines = validString.split("\n")
if (resultLines.size == 9) { // if (resultLines.size == 9) {
val deviceLog = fullReadOutput val deviceLog = fullReadOutput
val led1BufferForDevice = resultLines.find { it.startsWith("LB1") }?.substring(4) // val led1BufferForDevice = if (isUsingExistingBuffer) {
?.toDoubleOrNull() // sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")?.toDoubleOrNull()
?: 0.0 // } else {
val led2BufferForDevice = resultLines.find { it.startsWith("LB2") }?.substring(4) // resultLines.find { it.startsWith("LB1") }?.substring(4)
?.toDoubleOrNull() // ?.toDoubleOrNull()
?: 0.0 // ?: 0.0
val led3BufferForDevice = resultLines.find { it.startsWith("LB3") }?.substring(4) // }
?.toDoubleOrNull() val led1BufferForDevice = resultLines.find { it.startsWith("LB1") }?.substring(4)?.toDoubleOrNull() ?: 0.0
?: 0.0 val led2BufferForDevice = resultLines.find { it.startsWith("LB2") }?.substring(4)?.toDoubleOrNull() ?: 0.0
val led4BufferForDevice = resultLines.find { it.startsWith("LB4") }?.substring(4) val led3BufferForDevice = resultLines.find { it.startsWith("LB3") }?.substring(4)?.toDoubleOrNull() ?: 0.0
?.toDoubleOrNull() val led4BufferForDevice = resultLines.find { it.startsWith("LB4") }?.substring(4)?.toDoubleOrNull() ?: 0.0
?: 0.0 val led1Sample = resultLines.find { it.startsWith("LS1") }?.substring(4)?.toDoubleOrNull() ?: 0.0
val led2Sample = resultLines.find { it.startsWith("LS2") }?.substring(4)?.toDoubleOrNull() ?: 0.0
val led3Sample = resultLines.find { it.startsWith("LS3") }?.substring(4)?.toDoubleOrNull() ?: 0.0
val led4Sample = resultLines.find { it.startsWith("LS4") }?.substring(4)?.toDoubleOrNull() ?: 0.0
// val led1BufferForDevice = resultLines.find { it.startsWith("LB1") }?.let {
// try {
// it.substring(4).toDoubleOrNull() ?: 0.0
// } catch (e: NumberFormatException) {
// // Handle invalid number format, log an error, or set a default value
// Log.e("Parsing Error", "Invalid format for LB1: $it")
// 0.0
// }
// } ?: 0.0
//
// val led2BufferForDevice = if (isUsingExistingBuffer) {
// sharedPreferences.getString(Constants.BUFFER_VALUE_2, "")?.toDoubleOrNull()
// } else {
// resultLines.find { it.startsWith("LB2") }?.substring(4)
// ?.toDoubleOrNull()
// ?: 0.0
// }
// val led3BufferForDevice = resultLines.find { it.startsWith("LB3") }?.substring(4)
// ?.toDoubleOrNull()
// ?: 0.0
// val led4BufferForDevice = resultLines.find { it.startsWith("LB4") }?.substring(4)
// ?.toDoubleOrNull()
// ?: 0.0
val pInfo = requireActivity().packageManager.getPackageInfo( val pInfo = requireActivity().packageManager.getPackageInfo(
requireActivity().packageName, 0 requireActivity().packageName, 0
) )
val version = pInfo.versionName val version = pInfo.versionName
val led1Sample = resultLines.find { it.startsWith("LS1") }?.substring(4) // val led1Sample = resultLines.find { it.startsWith("LS1") }?.substring(4)
?.toDoubleOrNull() // ?.toDoubleOrNull()
?: 0.0 // ?: 0.0
val led2Sample = resultLines.find { it.startsWith("LS2") }?.substring(4) // val led2Sample = resultLines.find { it.startsWith("LS2") }?.substring(4)
?.toDoubleOrNull() // ?.toDoubleOrNull()
?: 0.0 // ?: 0.0
val led3Sample = resultLines.find { it.startsWith("LS3") }?.substring(4) // val led3Sample = resultLines.find { it.startsWith("LS3") }?.substring(4)
?.toDoubleOrNull() // ?.toDoubleOrNull()
?: 0.0 // ?: 0.0
val led4Sample = resultLines.find { it.startsWith("LS4") }?.substring(4) // val led4Sample = resultLines.find { it.startsWith("LS4") }?.substring(4)
?.toDoubleOrNull() // ?.toDoubleOrNull()
?: 0.0 // ?: 0.0
val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0) val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0)
val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0) val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0)
@@ -438,7 +465,7 @@ class HemoCubeFragment : Fragment() {
binding.clParent.setBackgroundColor(Color.parseColor("#edfffd")) binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
} }
} }
}
} catch (e: Exception) { } catch (e: Exception) {
Toast.makeText( Toast.makeText(
requireContext(), requireContext(),