call calculateRatio fun
This commit is contained in:
@@ -217,7 +217,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
|
|||||||
try {
|
try {
|
||||||
val result = validString.split(" ")
|
val result = validString.split(" ")
|
||||||
if (result.size == 8) {
|
if (result.size == 8) {
|
||||||
val deviceSerialNo = result[2]
|
val deviceId = result[2]
|
||||||
val led1BufferForDevice = result[3].toDoubleOrNull()
|
val led1BufferForDevice = result[3].toDoubleOrNull()
|
||||||
val led2BufferForDevice = result[4].toDoubleOrNull()
|
val led2BufferForDevice = result[4].toDoubleOrNull()
|
||||||
val led1Sample = result[5].toDoubleOrNull()
|
val led1Sample = result[5].toDoubleOrNull()
|
||||||
@@ -225,10 +225,10 @@ class HemoCubeBufferCheckFragment : Fragment() {
|
|||||||
val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0)
|
val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0)
|
||||||
val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0)
|
val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0)
|
||||||
val deviceRatio = led1Average / led2Average
|
val deviceRatio = led1Average / led2Average
|
||||||
val calculatedRatio = 0.14
|
|
||||||
val classificationResult = findResult(calculatedRatio)
|
val classificationResult = findResult(calculatedRatio)
|
||||||
messages.postValue(classificationResult)
|
messages.postValue(classificationResult)
|
||||||
val bufferData = BufferCheckData(
|
val bufferData = BufferCheckData(
|
||||||
|
deviceId= deviceId,
|
||||||
kitno = kitno,
|
kitno = kitno,
|
||||||
led1Buffer = led1BufferForDevice,
|
led1Buffer = led1BufferForDevice,
|
||||||
led2Buffer = led2BufferForDevice,
|
led2Buffer = led2BufferForDevice,
|
||||||
@@ -237,9 +237,9 @@ class HemoCubeBufferCheckFragment : Fragment() {
|
|||||||
led1Sample = led1Sample,
|
led1Sample = led1Sample,
|
||||||
led2Sample = led2Sample,
|
led2Sample = led2Sample,
|
||||||
deviceRatio = deviceRatio,
|
deviceRatio = deviceRatio,
|
||||||
calculatedRatio = calculatedRatio,
|
calculatedRatio = calculateRatio(deviceRatio),
|
||||||
classificationResult = classificationResult,
|
classificationResult = classificationResult,
|
||||||
deviceSerialNumber = deviceSerialNo,
|
deviceSerialNumber = sharedPreferences.getString(Constants.USER_ID, "").toString(),
|
||||||
testTime = SimpleDateFormat(
|
testTime = SimpleDateFormat(
|
||||||
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
||||||
).format(Calendar.getInstance().time)
|
).format(Calendar.getInstance().time)
|
||||||
|
|||||||
Reference in New Issue
Block a user