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 305457d..8aa857a 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 @@ -431,7 +431,7 @@ class HemoCubeFragment : Fragment() { (resultData.contains("#RC") && this.testStatusCode < TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code) -> { this.testStatusCode = TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code hemoCubeViewModel.messages.postValue("EPROM ADC Loaded") - checkCuvettePresence() + //checkCuvettePresence() showStartBufferButton() } @@ -439,6 +439,7 @@ class HemoCubeFragment : Fragment() { hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present)) this.testStatusCode = TestStatus.CUVETTE_PRESENT.code checkCuvette = true + showStartBufferButton() } resultData.contains("#AIN") && this.testStatusCode <= TestStatus.CUVETTE_ABSENT.code -> { hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent)) @@ -456,6 +457,7 @@ class HemoCubeFragment : Fragment() { binding.tvSubtitle4.text = getString(R.string.buffer_completed) binding.btnSamplestart.visibility = View.VISIBLE } + checkCuvette = false } (resultData.contains("#SS") || resultData.contains("#SS1")) && this.testStatusCode < TestStatus.SAMPLE_STARTED.code -> { @@ -626,6 +628,7 @@ class HemoCubeFragment : Fragment() { private fun showRetryButtonForCuvette() { activity?.runOnUiThread { + binding.btnPlacebuffer.visibility = View.GONE binding.btnRetryCheckCuvette.visibility = View.VISIBLE } } @@ -720,7 +723,7 @@ class HemoCubeFragment : Fragment() { binding.btnPlacebuffer.visibility = View.VISIBLE } - hemoCubeViewModel.messages.postValue(getString(R.string.start)) +// hemoCubeViewModel.messages.postValue(getString(R.string.start)) } fun extractV1HardwareId(input: String): String? { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index afade14..6e09b95 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -275,7 +275,7 @@ OK Activities Checking cuvette presence - Cuvette present + Cuvette present , you can start the test Cuvette is absent , please place the cuvette Retry \ No newline at end of file