Changes in 127, added HBTest screen option
This commit is contained in:
@@ -21,6 +21,7 @@ import com.example.hpostesting.data.model.test.TestType
|
||||
|
||||
object DataHolder {
|
||||
|
||||
var sampleId: String = "sampleId"
|
||||
var selectedTestType: TestType = TestType.SICKLECERT
|
||||
val usbConnected = MutableLiveData(true)
|
||||
var mobileUniqueId: String? = null
|
||||
@@ -37,6 +38,8 @@ object DataHolder {
|
||||
val intensityReferenceArray = ArrayList<Double>()
|
||||
var selectedTest: UserData? = null
|
||||
var hemoCubeTestData: HemoCubeTestData? = null
|
||||
var bloodGroup: String = "Unknown"
|
||||
var age = "0"
|
||||
var kitSerial: String = ""
|
||||
var centerName: String = ""
|
||||
var district: String = ""
|
||||
|
||||
@@ -122,15 +122,10 @@ class DatabaseRepository @Inject constructor(
|
||||
}
|
||||
override suspend fun addQcTestToDatabase(data: HemoCubeTestData?): Response<String> {
|
||||
return try {
|
||||
val userdata =
|
||||
db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
|
||||
if (userdata.documents.isNotEmpty()) {
|
||||
userdata.documents.forEach {
|
||||
db.collection("patientData").document(it.id).update("testStatus", true)
|
||||
}
|
||||
}
|
||||
db.collection("qcData").add(data).await()
|
||||
|
||||
db.collection("qcData").add(data!!).await()
|
||||
Response.Success(data._id)
|
||||
|
||||
} catch (e: Exception) {
|
||||
Response.Error(e)
|
||||
}
|
||||
|
||||
@@ -31,6 +31,7 @@ import android.os.BatteryManager
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.os.Environment
|
||||
import android.provider.ContactsContract.Data
|
||||
import android.provider.Settings
|
||||
import android.util.Base64
|
||||
import android.util.Log
|
||||
@@ -798,8 +799,11 @@ class HomeFragment : Fragment() {
|
||||
private fun setUserId() {
|
||||
binding.btnSubmit.setOnClickListener {
|
||||
val userId = binding.userId.text.toString()
|
||||
DataHolder.sampleId = userId
|
||||
val age = binding.age.text.toString()
|
||||
DataHolder.age = age
|
||||
val bloodGroup = binding.etBloodGroup.text.toString()
|
||||
DataHolder.bloodGroup = bloodGroup
|
||||
|
||||
// if (userId.length >= 5 && bloodGroup != "Select Blood Group") {
|
||||
// DataHolder.selectedTest = UserData(
|
||||
|
||||
@@ -25,6 +25,7 @@ import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.activityViewModels
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import com.example.hpostesting.data.constant.Constants
|
||||
import com.example.hpostesting.data.constant.DataHolder
|
||||
import com.example.hpostesting.data.constant.HemoCubeCommands
|
||||
import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
|
||||
import com.example.hpostesting.data.model.patient.DeviceData
|
||||
@@ -41,7 +42,21 @@ import java.util.Locale
|
||||
import kotlin.math.log10
|
||||
|
||||
class HBTestFragment : Fragment() {
|
||||
private var readClick = false
|
||||
private var isUsingExistingBuffer = false
|
||||
private var led1Average = 0.0
|
||||
private var led3Average = 0.0
|
||||
private var led2Average = 0.0
|
||||
private var led4Average = 0.0
|
||||
private var led1SampleForDevice = 0.0
|
||||
private var led2SampleForDevice = 0.0
|
||||
private var led3SampleForDevice = 0.0
|
||||
private var led4SampleForDevice = 0.0
|
||||
private var led1BufferForDevice = 0.0
|
||||
private var led2BufferForDevice = 0.0
|
||||
private var led3BufferForDevice = 0.0
|
||||
private var led4BufferForDevice = 0.0
|
||||
private var x = 0.0
|
||||
private var deviceId = ""
|
||||
private var hbEst = 0.0
|
||||
private var testStatusCode = 0.0
|
||||
private var testDetails: HemoCubeTestData = HemoCubeTestData()
|
||||
@@ -76,20 +91,54 @@ class HBTestFragment : Fragment() {
|
||||
binding.btnSubmit.setOnClickListener {
|
||||
hBTestViewModel.messages.postValue(resultData)
|
||||
binding.btnSubmit.visibility = View.GONE
|
||||
|
||||
testDetails.localFlag = false
|
||||
testDetails.testStatus = true
|
||||
testDetails.deviceId = deviceId
|
||||
testDetails._id = DataHolder.sampleId
|
||||
testDetails.kitSerial = DataHolder.kitSerial
|
||||
testDetails.classificationResult = "HB: $hbEst"
|
||||
testDetails.hb3 = x
|
||||
testDetails.hb4 = hbEst
|
||||
testDetails.age = DataHolder.age
|
||||
testDetails.bloodGroup = DataHolder.bloodGroup
|
||||
testDetails.led1Buffer = led1BufferForDevice
|
||||
testDetails.led2Buffer = led2BufferForDevice
|
||||
testDetails.led3Buffer = led3BufferForDevice
|
||||
testDetails.led4Buffer = led4BufferForDevice
|
||||
testDetails.led1Sample = led1SampleForDevice
|
||||
testDetails.led2Sample = led2SampleForDevice
|
||||
testDetails.led3Sample = led3SampleForDevice
|
||||
testDetails.led4Sample = led4SampleForDevice
|
||||
testDetails.led1Average = led1Average
|
||||
testDetails.led2Average = led2Average
|
||||
testDetails.led3Average = led3Average
|
||||
testDetails.led4Average = led4Average
|
||||
testDetails.testType = "HB Est"
|
||||
testDetails.testTime = SimpleDateFormat(
|
||||
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
||||
).format(Calendar.getInstance().time)
|
||||
hBTestViewModel.uploadFirebaseQc(testDetails)
|
||||
}
|
||||
binding.btnBuffer.setOnClickListener {
|
||||
binding.btnBuffer.visibility = View.GONE
|
||||
hBTestViewModel.messages.postValue("Buffer Started")
|
||||
runBCommand()
|
||||
}
|
||||
binding.btnSample.setOnClickListener {
|
||||
hBTestViewModel.messages.postValue("Sample Started")
|
||||
binding.btnSample.visibility = View.GONE
|
||||
binding.btnBuffer.visibility = View.GONE
|
||||
runSCommand()
|
||||
}
|
||||
binding.btnSubmit.setOnClickListener {
|
||||
binding.btnSubmit.visibility = View.GONE
|
||||
|
||||
if (isBufferValueAvailable()) {
|
||||
isUsingExistingBuffer = true
|
||||
binding.btnBuffer.text = "Refresh Buffer"
|
||||
binding.btnSample.isEnabled = true
|
||||
binding.btnSample.isClickable = true
|
||||
}else{
|
||||
binding.btnBuffer.text = "Start Buffer"
|
||||
binding.btnSample.isEnabled = false
|
||||
binding.btnSample.isClickable = false
|
||||
}
|
||||
|
||||
}
|
||||
@@ -106,10 +155,11 @@ class HBTestFragment : Fragment() {
|
||||
|
||||
hBTestViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
|
||||
if (result == "Success") {
|
||||
showToast("Auto Dac data uploaded successfully")
|
||||
showToast("Data uploaded successfully")
|
||||
requireActivity().finish()
|
||||
}
|
||||
if (result == "Local") {
|
||||
showToast("Auto Dac uploading failed, note it down manually")
|
||||
showToast("Data uploading failed, note it down manually")
|
||||
}
|
||||
|
||||
binding.progressBar.visibility = View.GONE
|
||||
@@ -124,6 +174,7 @@ class HBTestFragment : Fragment() {
|
||||
override fun onUsbRead(data: ByteArray?) {
|
||||
data?.let {
|
||||
val stringData = String(it)
|
||||
deviceId = stringData
|
||||
hBTestViewModel.messages.postValue(stringData)
|
||||
binding.tvSubtitle4.text = stringData
|
||||
}
|
||||
@@ -187,14 +238,13 @@ class HBTestFragment : Fragment() {
|
||||
val stringData = String(it)
|
||||
fullReadOutput.append(stringData)
|
||||
resultData += stringData
|
||||
if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
|
||||
hBTestViewModel.messages.postValue(resultData)
|
||||
}
|
||||
hBTestViewModel.messages.postValue(resultData)
|
||||
// binding.tvSubtitle4.text = resultData
|
||||
if (stringData.contains("SN")) {
|
||||
val slData = stringData.split(" ")
|
||||
if (slData.size > 1) {
|
||||
val hardwareId = slData[1].trim()
|
||||
hBTestViewModel.messages.postValue("Place buffer and click below button to start test")
|
||||
// with(sharedPreferences.edit()) {
|
||||
// putString(Constants.DEVICE_ID, hardwareId)
|
||||
// apply()
|
||||
@@ -207,27 +257,27 @@ class HBTestFragment : Fragment() {
|
||||
}
|
||||
if (resultData.contains("#BC") && testStatusCode < 1.0) {
|
||||
testStatusCode = 1.1
|
||||
hBTestViewModel.messages.postValue(
|
||||
getString(R.string.buffer_completed) + "\n" + getString(R.string.gathering_data)
|
||||
)
|
||||
resultData += getString(R.string.buffer_completed)
|
||||
hBTestViewModel.messages.postValue(resultData)
|
||||
activity?.runOnUiThread {
|
||||
binding.btnSample.visibility = View.VISIBLE
|
||||
binding.btnSample.isEnabled = true
|
||||
binding.btnSample.isClickable = true
|
||||
}
|
||||
}
|
||||
|
||||
if (resultData.contains("#SC") && testStatusCode < 1.3) {
|
||||
testStatusCode = 1.4
|
||||
hBTestViewModel.messages.postValue(
|
||||
getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data)
|
||||
)
|
||||
resultData +=getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data)
|
||||
hBTestViewModel.messages.postValue(resultData)
|
||||
activity?.runOnUiThread {
|
||||
binding.btnSubmit.visibility = View.VISIBLE
|
||||
runPCommand()
|
||||
}
|
||||
runPCommand()
|
||||
}
|
||||
|
||||
if (resultData.contains("REND") && readClick && testStatusCode < 2.1) {
|
||||
testStatusCode = 2.2
|
||||
if (resultData.contains("REND") && testStatusCode < 1.5) {
|
||||
testStatusCode = 1.6
|
||||
runResult()
|
||||
}
|
||||
}
|
||||
@@ -242,76 +292,99 @@ class HBTestFragment : Fragment() {
|
||||
}
|
||||
|
||||
private fun runResult() {
|
||||
hBTestViewModel.messages.postValue("Fetching results...")
|
||||
resultData += "\nFetching results...\n"
|
||||
hBTestViewModel.messages.postValue(resultData)
|
||||
|
||||
val resultLines = resultData.split("\\s+(?=LB|LS)".toRegex())
|
||||
var bufferIntensity = resultLines[1].split(' ')[1].trim()
|
||||
val led1BufferForDevice = bufferIntensity.toDoubleOrNull()!!
|
||||
led1BufferForDevice = if (isUsingExistingBuffer) {
|
||||
sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")?.toDoubleOrNull()!!
|
||||
} else {
|
||||
bufferIntensity.toDoubleOrNull()!!
|
||||
}
|
||||
|
||||
bufferIntensity = resultLines[2].split(' ')[1].trim()
|
||||
val led2BufferForDevice = bufferIntensity.toDoubleOrNull()!!
|
||||
led2BufferForDevice = if (isUsingExistingBuffer) {
|
||||
sharedPreferences.getString(Constants.BUFFER_VALUE_2, "")?.toDoubleOrNull()!!
|
||||
} else {
|
||||
bufferIntensity.toDoubleOrNull()!!
|
||||
}
|
||||
|
||||
bufferIntensity = resultLines[3].split(' ')[1].trim()
|
||||
val led3BufferForDevice = bufferIntensity.toDoubleOrNull()!!
|
||||
led3BufferForDevice = if (isUsingExistingBuffer) {
|
||||
sharedPreferences.getString(Constants.BUFFER_VALUE_3, "")?.toDoubleOrNull()!!
|
||||
} else {
|
||||
bufferIntensity.toDoubleOrNull()!!
|
||||
}
|
||||
|
||||
bufferIntensity = resultLines[4].split(' ')[1].trim()
|
||||
val led4BufferForDevice = bufferIntensity.toDoubleOrNull()!!
|
||||
led4BufferForDevice = if (isUsingExistingBuffer) {
|
||||
sharedPreferences.getString(Constants.BUFFER_VALUE_4, "")?.toDoubleOrNull()!!
|
||||
} else {
|
||||
bufferIntensity.toDoubleOrNull()!!
|
||||
}
|
||||
|
||||
|
||||
val led1SampleForDevice = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
|
||||
val led2SampleForDevice = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
|
||||
val led3SampleForDevice = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
|
||||
val led4SampleForDevice = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
|
||||
led1SampleForDevice = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
|
||||
led2SampleForDevice = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
|
||||
led3SampleForDevice = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
|
||||
led4SampleForDevice = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
|
||||
|
||||
val led1Average = log10(led1BufferForDevice.div(led1SampleForDevice))
|
||||
val led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
|
||||
val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
|
||||
val led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
|
||||
led1Average = log10(led1BufferForDevice.div(led1SampleForDevice))
|
||||
led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
|
||||
led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
|
||||
led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
|
||||
|
||||
val x = led1Average - led3Average
|
||||
x = led1Average - led3Average
|
||||
|
||||
hbEst = (7.347 * x * x) + (12.704 * x) + 0.9033
|
||||
|
||||
hBTestViewModel.messages.postValue("Result: HB EST: $hbEst")
|
||||
}
|
||||
|
||||
fun extractSubstring(input: String): String {
|
||||
val regex = "#CS(.*?)#CC".toRegex()
|
||||
val matchResult = regex.find(input)
|
||||
return matchResult?.groups?.get(1)?.value?.trim() ?: ""
|
||||
}
|
||||
private fun validateDacValues(): Boolean {
|
||||
val pattern = Regex("(LED:\\d+)__DAC:(\\d+)__ADC:(\\d+)")
|
||||
val matches = pattern.findAll(resultData)
|
||||
for (match in matches) {
|
||||
val ledName = match.groupValues[1]
|
||||
val xValue = match.groupValues[2].toDouble()
|
||||
val yValue = match.groupValues[3].toDouble()
|
||||
|
||||
if(xValue == 3200.0){
|
||||
if(yValue < 500.0){
|
||||
return false
|
||||
}
|
||||
resultData +="\n Result: HB EST: $hbEst"
|
||||
if (!isUsingExistingBuffer) {
|
||||
with(sharedPreferences.edit()) {
|
||||
putString(Constants.BUFFER_VALUE_1, led1BufferForDevice.toString())
|
||||
putString(Constants.BUFFER_VALUE_2, led2BufferForDevice.toString())
|
||||
putString(Constants.BUFFER_VALUE_3, led3BufferForDevice.toString())
|
||||
putString(Constants.BUFFER_VALUE_4, led4BufferForDevice.toString())
|
||||
apply()
|
||||
}
|
||||
}
|
||||
return true
|
||||
hBTestViewModel.messages.postValue(resultData)
|
||||
}
|
||||
|
||||
fun parseData(inputData: List<String>): List<Pair<String, String>> {
|
||||
val pattern = Regex("([A-Z]+)\\s(\\d+)")
|
||||
val parsedData = mutableListOf<Pair<String, String>>()
|
||||
|
||||
for (item in inputData) {
|
||||
val matchResult = pattern.find(item)
|
||||
if (matchResult != null) {
|
||||
val (letters, numbers) = matchResult.destructured
|
||||
parsedData.add(Pair(letters, numbers))
|
||||
}
|
||||
}
|
||||
|
||||
return parsedData
|
||||
}
|
||||
|
||||
private fun showToast(message: String) {
|
||||
Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
private fun isBufferValueAvailable(): Boolean {
|
||||
return try {
|
||||
if (sharedPreferences.getString(
|
||||
Constants.BUFFER_VALUE_1, ""
|
||||
) != "" && sharedPreferences.getString(Constants.BUFFER_VALUE_2, "") != ""
|
||||
&& sharedPreferences.getString(Constants.BUFFER_VALUE_3, "") != ""
|
||||
&& sharedPreferences.getString(Constants.BUFFER_VALUE_4, "") != ""
|
||||
) {
|
||||
sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")
|
||||
?.toDouble()!! > 0.0 && sharedPreferences.getString(
|
||||
Constants.BUFFER_VALUE_2,
|
||||
""
|
||||
)
|
||||
?.toDouble()!! > 0.0 && sharedPreferences.getString(
|
||||
Constants.BUFFER_VALUE_3,
|
||||
""
|
||||
)
|
||||
?.toDouble()!! > 0.0 && sharedPreferences.getString(
|
||||
Constants.BUFFER_VALUE_4,
|
||||
""
|
||||
)
|
||||
?.toDouble()!! > 0.0
|
||||
} else {
|
||||
false
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
showToast("error_exist")
|
||||
false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -45,21 +45,25 @@ class HBTestViewModel @Inject constructor(
|
||||
val fireBaseUpload = MutableLiveData<String>()
|
||||
fun uploadFirebaseQc(testDetails: HemoCubeTestData){
|
||||
viewModelScope.launch {
|
||||
when (val response = repository.addQcTestToDatabase(testDetails)) {
|
||||
is Response.Success -> {
|
||||
Log.i("Testdb", "Data uploaded to Firestore successfully")
|
||||
fireBaseUpload.postValue("Success")
|
||||
testDetails.localFlag = true
|
||||
hemoCubeDao.updateTest(testDetails)
|
||||
}
|
||||
try {
|
||||
when (val response = repository.addTestToDatabase(testDetails)) {
|
||||
is Response.Success -> {
|
||||
Log.i("Testdb", "Data uploaded to Firestore successfully")
|
||||
fireBaseUpload.postValue("Success")
|
||||
testDetails.localFlag = true
|
||||
hemoCubeDao.updateTest(testDetails)
|
||||
}
|
||||
|
||||
is Response.Error -> {
|
||||
Log.e("Testdb", "Error uploading data to Firestore: $response")
|
||||
fireBaseUpload.postValue("Error")
|
||||
hemoCubeDao.updateTest(testDetails)
|
||||
}
|
||||
is Response.Error -> {
|
||||
Log.e("Testdb", "Error uploading data to Firestore: $response")
|
||||
fireBaseUpload.postValue("Error")
|
||||
hemoCubeDao.updateTest(testDetails)
|
||||
}
|
||||
|
||||
else -> {}
|
||||
else -> {}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
fireBaseUpload.postValue("Error")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,10 +92,10 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="16dp"
|
||||
android:layout_marginTop="24dp"
|
||||
android:layout_marginTop="15dp"
|
||||
android:clickable="false"
|
||||
android:gravity="center"
|
||||
android:visibility="gone"
|
||||
android:visibility="visible"
|
||||
android:text="Sample Start"
|
||||
android:textColor="@color/white"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
Reference in New Issue
Block a user