fix testing steps

This commit is contained in:
Pritimay Sarkar
2023-11-07 07:38:10 +05:30
parent f0d0740cd7
commit 9d86d874af

View File

@@ -42,7 +42,7 @@ class HemoCubeFragment : Fragment() {
private var isUsingExistingBuffer = false
private var isTestOngoing = false
private var startListening = MutableLiveData<Boolean>(false)
val testingTrace = Firebase.performance.newTrace("testing_trace")
private val testingTrace = Firebase.performance.newTrace("testing_trace")
private var led1BufferForDevice = 0.0
private var led2BufferForDevice = 0.0
private var led3BufferForDevice = 0.0
@@ -67,7 +67,6 @@ class HemoCubeFragment : Fragment() {
listenToHemoCube()
getDeviceInfo()
observeViewModel()
// checkAndStartProcess()
}
private fun initViews() {
@@ -79,11 +78,6 @@ class HemoCubeFragment : Fragment() {
isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "")
)
}
if (isTestOngoing) {
// binding.btnKit.visibility = View.GONE
// binding.btnKit.isEnabled = false
// binding.btnKit.isClickable = false
}
binding.tvTitle2.visibility = View.GONE
binding.etAbhaId.visibility = View.GONE
@@ -94,10 +88,8 @@ class HemoCubeFragment : Fragment() {
binding.btnSubmit.isClickable = false
binding.btnPlacebuffer.visibility = View.GONE
binding.tvName.text = "Name: ${testDetails?.name}\n ID: ${testDetails?._id}"
Log.e("nametext", binding.tvName.text.toString())
binding.tvSubtitle4.text = "Config"
binding.btnSamplestart.setOnClickListener {
activity?.runOnUiThread {
@@ -167,28 +159,11 @@ class HemoCubeFragment : Fragment() {
}
hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
// binding.tvSubtitle4.text = it
binding.tvSubtitle4.text = it
}
// startListening.observe(viewLifecycleOwner) {
// if (it) {
// lifecycleScope.launch {
// delay(1000)
// if (binding.tvSubtitle4.text.toString().isEmpty()) {
// (activity as HemocubeActivity).reconnectDevice()
// if (isBufferValueAvailable()) {
// showBufferAlertDialog()
// } else {
// listenToHemoCube()
// startBufferProcess()
// }
// }
// }
// }
// }
}
private fun checkAndStartProcess() {
// listenToHemoCube()
startBufferProcess()
}
@@ -236,16 +211,14 @@ class HemoCubeFragment : Fragment() {
positiveText,
object : MyDialogListener {
override fun onClickNegativeButton() {
// listenToHemoCube()
startBufferProcess()
}
override fun onClickPositiveButton() {
// listenToHemoCube()
// startSampleProcess()
activity?.runOnUiThread {
binding.btnPlacebuffer.visibility = View.GONE
binding.btnSamplestart.visibility = View.VISIBLE
binding.tvSubtitle4.text = "Place Sample"
}
isUsingExistingBuffer = true
}
@@ -303,7 +276,6 @@ class HemoCubeFragment : Fragment() {
private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
if (stringData.contains("#")) {
hemoCubeViewModel.messages.postValue(stringData)
isTestOngoing = true
}
@@ -322,6 +294,13 @@ class HemoCubeFragment : Fragment() {
activity?.runOnUiThread {
binding.btnPlacebuffer.visibility = View.VISIBLE
}
hemoCubeViewModel.messages.postValue("Start Buffer")
}
stringData.contains("#BS") -> {
activity?.runOnUiThread {
binding.tvSubtitle4.text = "Buffer Started"
}
}
stringData.contains("#BC") -> {
@@ -331,6 +310,13 @@ class HemoCubeFragment : Fragment() {
}
}
stringData.contains("#SS") -> {
activity?.runOnUiThread {
binding.tvSubtitle4.text = "Sample Started"
binding.btnSamplestart.visibility = View.GONE
}
}
stringData.contains("#SC") -> {
binding.tvSubtitle4.text = "Sample Completed"
fetchResult()
@@ -377,14 +363,6 @@ class HemoCubeFragment : Fragment() {
}
}
private fun isValidResult(line: String): String {
return if (line.contains("RESULT") && line.split(" ").size == 8) {
line
} else {
""
}
}
private fun showError() {
activity?.runOnUiThread {
UIUtils.createAlertDialog(requireContext(),
@@ -414,24 +392,6 @@ class HemoCubeFragment : Fragment() {
}
}
private fun showStartSampleDialog() {
activity?.runOnUiThread {
UIUtils.createAlertDialog(requireContext(),
"Start Sample",
"Do you want to start sample reading?",
getString(R.string.no),
"Yes",
object : MyDialogListener {
override fun onClickNegativeButton() {}
override fun onClickPositiveButton() {
listenToHemoCube()
startSampleProcess()
}
})
}
}
private fun processResult() {
try {
val deviceLog = resultData
@@ -584,21 +544,6 @@ class HemoCubeFragment : Fragment() {
return coefficient1 * ratio + coefficient2
}
private fun parseResult(frames: List<String>): String {
val lines = mutableListOf<String>()
for (frame in frames.reversed()) {
if (frame.contains("REND") || frame.contains("RESULT")) lines += frame
if (frame.contains("RESULT")) {
break
}
}
val line = lines.reversed().joinToString("").trim()
if (line.contains("RESULT") && line.split(" ").size == 8) {
return line
}
return ""
}
private fun checkDeviceIdMismatch(deviceId: String, loginId: String): Boolean {
if (!deviceId.isNullOrEmpty() && !loginId.isNullOrEmpty() && deviceId.last() != loginId.last())
return true