From 8872e484a15c079ecebc8f7c3e3f511dd3f83e37 Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Mon, 30 Oct 2023 21:08:02 +0530 Subject: [PATCH] refactoring --- .../data/constant/HemoCubeCommands.kt | 2 +- .../HemoCubeBufferCheckFragment.kt | 3 +- .../diagnostics/DiagnosticsFragment.kt | 34 +++---------------- 3 files changed, 7 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt b/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt index 9cf44a6..1a806e2 100644 --- a/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt +++ b/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt @@ -2,7 +2,7 @@ package com.example.hpostesting.data.constant enum class HemoCubeCommands(val command: String) { startBuffer("B\r"), - getBuffer("D\r"), + runDiagnostics("D\r"), startSample("S\r"), getSample("P\r"), getDeviceId("I\r"), diff --git a/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt index 4be9f3d..a7a9337 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt @@ -225,6 +225,7 @@ class HemoCubeBufferCheckFragment : Fragment() { val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0) val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0) val deviceRatio = led1Average / led2Average + val calculateRatio = calculateRatio(deviceRatio) val classificationResult = findResult(deviceRatio) messages.postValue(classificationResult) val bufferData = BufferCheckData( @@ -237,7 +238,7 @@ class HemoCubeBufferCheckFragment : Fragment() { led1Sample = led1Sample, led2Sample = led2Sample, deviceRatio = deviceRatio, - calculatedRatio = calculateRatio(deviceRatio), + calculatedRatio = calculateRatio, classificationResult = classificationResult, deviceSerialNumber = sharedPreferences.getString(Constants.USER_ID, "").toString(), testTime = SimpleDateFormat( diff --git a/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt index 3d51759..5c10c99 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt @@ -7,24 +7,16 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.MutableLiveData -import com.example.hpostesting.data.DataHolder import com.example.hpostesting.data.constant.Constants import com.example.hpostesting.data.constant.HemoCubeCommands import com.example.hpostesting.data.model.diagnostics.DiagnosticsData import com.example.hpostesting.data.model.patient.DeviceData -import com.example.hpostesting.data.model.patient.toHemoCubeTestData import com.example.hpostesting.presentation.UsbServiceListener -import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel -import com.example.hpostesting.presentation.hemocube.HemocubeActivity -import com.example.hpostesting.presentation.utils.MyDialogListener -import com.example.hpostesting.presentation.utils.UIUtils import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase -import `in`.sminnovations.hpostesting.R import `in`.sminnovations.hpostesting.databinding.FragmentDiagnosticsBinding import java.text.SimpleDateFormat import java.util.Calendar @@ -38,7 +30,6 @@ class DiagnosticsFragment : Fragment() { private var currentDeviceData: DeviceData? = null private var resultData: String = "" private val messages = MutableLiveData() - private var isTestOngoing = false private var startListening = MutableLiveData(false) override fun onCreateView( @@ -62,7 +53,7 @@ class DiagnosticsFragment : Fragment() { getDeviceId() binding.btnSubmit.setOnClickListener { binding.btnSubmit.visibility = View.GONE - getBufferdiagnostics() + runDeviceDiagnostics() } } @@ -73,23 +64,6 @@ class DiagnosticsFragment : Fragment() { currentDeviceData = it } - diagnosticsViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable -> - if (isNetworkAvailable) { -// diagnosticsViewModel.getDeviceData( -// sharedPreferences.getString( -// Constants.USER_ID, -// "" -// ) -// ) - } else { - Toast.makeText( - requireContext(), - "No internet connection avaiable", - Toast.LENGTH_SHORT - ).show() - } - } - messages.observe(viewLifecycleOwner) { binding.tvSubtitle4.text = it Log.e("diagnostics",binding.tvSubtitle4.text.toString()) @@ -110,7 +84,7 @@ class DiagnosticsFragment : Fragment() { if (matchResult != null) { val (sn, hardwareId) = matchResult.destructured with(sharedPreferences.edit()) { - putString(com.example.hpostesting.data.constant.Constants.DEVICE_ID, hardwareId) + putString(Constants.DEVICE_ID, hardwareId) apply() } } @@ -123,10 +97,10 @@ class DiagnosticsFragment : Fragment() { }) } - private fun getBufferdiagnostics() { + private fun runDeviceDiagnostics() { diagnosticsViewModel.progressBar.postValue(true) (activity as DiagnosticsActivity).mService.sendAndListenToHemoCube( - HemoCubeCommands.getBuffer, + HemoCubeCommands.runDiagnostics, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) {