testing L command changed the flow in HemoCubeFragment
This commit is contained in:
@@ -35,7 +35,7 @@ import kotlin.math.log10
|
|||||||
|
|
||||||
@Suppress("MemberVisibilityCanBePrivate")
|
@Suppress("MemberVisibilityCanBePrivate")
|
||||||
class HemoCubeFragment : Fragment() {
|
class HemoCubeFragment : Fragment() {
|
||||||
|
private var checkCuvette = false
|
||||||
private lateinit var binding: FragmentHemoCubeReferenceBinding
|
private lateinit var binding: FragmentHemoCubeReferenceBinding
|
||||||
private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
|
private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
|
||||||
private lateinit var sharedPreferences: SharedPreferences
|
private lateinit var sharedPreferences: SharedPreferences
|
||||||
@@ -117,30 +117,39 @@ class HemoCubeFragment : Fragment() {
|
|||||||
binding.tvSubtitle4.text = "Config"
|
binding.tvSubtitle4.text = "Config"
|
||||||
|
|
||||||
binding.btnSamplestart.setOnClickListener {
|
binding.btnSamplestart.setOnClickListener {
|
||||||
activity?.runOnUiThread {
|
if(checkCuvette){
|
||||||
binding.tvSubtitle4.visibility = View.VISIBLE
|
activity?.runOnUiThread {
|
||||||
|
binding.tvSubtitle4.visibility = View.VISIBLE
|
||||||
// binding.tvSubtitle4.text = "Sample Started"
|
// binding.tvSubtitle4.text = "Sample Started"
|
||||||
|
}
|
||||||
|
startSampleProcess()
|
||||||
|
it.visibility = View.GONE
|
||||||
|
}else{
|
||||||
|
checkCuvettePresence()
|
||||||
}
|
}
|
||||||
startSampleProcess()
|
|
||||||
it.visibility = View.GONE
|
|
||||||
}
|
}
|
||||||
binding.btnRetryCheckCuvette.setOnClickListener {
|
binding.btnRetryCheckCuvette.setOnClickListener {
|
||||||
|
|
||||||
checkCuvettePresence()
|
checkCuvettePresence()
|
||||||
}
|
}
|
||||||
binding.btnPlacebuffer.setOnClickListener {
|
binding.btnPlacebuffer.setOnClickListener {
|
||||||
if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
|
if(checkCuvette){
|
||||||
showBufferAlertDialog()
|
if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
|
||||||
} else {
|
showBufferAlertDialog()
|
||||||
activity?.runOnUiThread {
|
} else {
|
||||||
binding.tvSubtitle4.visibility = View.VISIBLE
|
activity?.runOnUiThread {
|
||||||
|
binding.tvSubtitle4.visibility = View.VISIBLE
|
||||||
// binding.tvSubtitle4.text = "Buffer Started"
|
// binding.tvSubtitle4.text = "Buffer Started"
|
||||||
}
|
}
|
||||||
|
|
||||||
// checkAndStartProcess()
|
// checkAndStartProcess()
|
||||||
startBufferProcess()
|
startBufferProcess()
|
||||||
it.visibility = View.GONE
|
it.visibility = View.GONE
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
checkCuvettePresence()
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
|
if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
|
||||||
@@ -423,12 +432,13 @@ class HemoCubeFragment : Fragment() {
|
|||||||
this.testStatusCode = TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code
|
this.testStatusCode = TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code
|
||||||
hemoCubeViewModel.messages.postValue("EPROM ADC Loaded")
|
hemoCubeViewModel.messages.postValue("EPROM ADC Loaded")
|
||||||
checkCuvettePresence()
|
checkCuvettePresence()
|
||||||
|
showStartBufferButton()
|
||||||
}
|
}
|
||||||
|
|
||||||
resultData.contains("#CIN") && this.testStatusCode < TestStatus.CUVETTE_PRESENT.code -> {
|
resultData.contains("#CIN") && this.testStatusCode < TestStatus.CUVETTE_PRESENT.code -> {
|
||||||
hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
|
hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
|
||||||
this.testStatusCode = TestStatus.CUVETTE_PRESENT.code
|
this.testStatusCode = TestStatus.CUVETTE_PRESENT.code
|
||||||
showStartBufferButton()
|
checkCuvette = true
|
||||||
}
|
}
|
||||||
resultData.contains("#AIN") && this.testStatusCode <= TestStatus.CUVETTE_ABSENT.code -> {
|
resultData.contains("#AIN") && this.testStatusCode <= TestStatus.CUVETTE_ABSENT.code -> {
|
||||||
hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent))
|
hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent))
|
||||||
@@ -1161,6 +1171,8 @@ class HemoCubeFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun checkCuvettePresence() {
|
private fun checkCuvettePresence() {
|
||||||
|
Toast.makeText(requireContext(),"Please wait...",Toast.LENGTH_LONG).show()
|
||||||
|
|
||||||
activity?.runOnUiThread {
|
activity?.runOnUiThread {
|
||||||
binding.btnRetryCheckCuvette.visibility = View.GONE
|
binding.btnRetryCheckCuvette.visibility = View.GONE
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user