diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt index ee592d9..bb19bde 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt @@ -226,6 +226,42 @@ class HemoCubeFragment : Fragment() { } } +// private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) { +// if (stringData.contains("#")) { +// hemoCubeViewModel.messages.postValue(stringData) +// isTestOngoing = true +// } +// +// resultData += stringData +// +// when { +// stringData.contains("#Buffer Completed") -> showStartSampleDialog() +// stringData.contains("#Sample Completed") -> { +// fetchResult() +// testingTrace.stop() +// } +// +// stringData.contains("RESULT") || resultData.contains("REND") -> { +// var validString: String +// val results: List +// if (stringData.contains("RESULT")) { +// validString = isValidResult(stringData) +// if (validString.isEmpty()) { +// results = resultData.split("\n") +// validString = parseResult(results) +// } +// } else { +// results = resultData.split("\n") +// validString = parseResult(results) +// } +// if (validString.isNotEmpty()) { +// handleValidResult(validString, resultData) +// } +// } +// } +// } + + private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) { if (stringData.contains("#")) { hemoCubeViewModel.messages.postValue(stringData) @@ -255,13 +291,27 @@ class HemoCubeFragment : Fragment() { validString = parseResult(results) } if (validString.isNotEmpty()) { - handleValidResult(validString, resultData) + // Extract labels and corresponding values + val resultLines = validString.split("\n") + val formattedResult = StringBuilder() + for (line in resultLines) { + val parts = line.split(" ") + if (parts.size == 2) { + formattedResult.append("${parts[0]}\n${parts[1]}\n") + } + } + handleValidResult(formattedResult.toString().trim(), resultData) } } } } + + + + + private fun showError() { activity?.runOnUiThread { UIUtils.createAlertDialog(requireContext(),