From 97ec9318142eac9adfc3b854d0394c8e6c7f83da Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Thu, 25 Jan 2024 12:15:41 +0530 Subject: [PATCH] fix sample name and device id empty --- .../presentation/hemocube/HemoCubeFragment.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 d4ff601..5f7843f 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 @@ -317,9 +317,7 @@ class HemoCubeFragment : Fragment() { } private fun listenToHemoCube() { - if (DataHolder.hemoCubeTestData == null) { - DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData() - } + DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData() hemoCubeViewModel.progressBar.postValue(true) val fullReadOutput = StringBuilder() @@ -584,7 +582,7 @@ class HemoCubeFragment : Fragment() { } if (!Constants.DEVICE_CONFIGURATION.containsKey(deviceHardwareId)) { - assignDefaultDevice() + assignDefaultDevice(resultData) allErrorMessages += "Calibration configuration for this device id is not found\n" } if (!Constants.BUFFER_INTENSITY_THRESHOLDS.containsKey(deviceHardwareId)) { @@ -592,8 +590,12 @@ class HemoCubeFragment : Fragment() { } } - fun assignDefaultDevice() { + fun assignDefaultDevice(configData: String) { deviceHardwareId = "HCV-000-3001" + with(sharedPreferences.edit()) { + putString(Constants.DEVICE_ID, configData) + apply() + } testStatusCode = TestStatus.CONFIG_COMPLETED.code activity?.runOnUiThread { binding.btnPlacebuffer.visibility = View.VISIBLE @@ -602,7 +604,7 @@ class HemoCubeFragment : Fragment() { } fun extractMiddleString(input: String): String? { - val pattern = Regex("SNS\\s(.*?)\\sSNE") + val pattern = Regex("SNS\\s*(.*?)\\s*SNE") val matchResult: MatchResult? = pattern.find(input) return matchResult?.groups?.get(1)?.value