diff --git a/app/build.gradle b/app/build.gradle index e3d7bd5..2068d64 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { applicationId "in.sminnovations.hpostesting.dev" minSdk 21 targetSdk 34 - versionCode 82 - versionName "2.1.82" + versionCode 85 + versionName "2.1.85" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } 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 280049f..5f28dd4 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 @@ -1,12 +1,12 @@ package com.example.hpostesting.data.constant enum class HemoCubeCommands(val command: String) { - startBuffer("B\r"), + START_BUFFER_COMMAND("B\r"), AUTO_DAC_COMMAND("C\r"), - runDiagnostics("D\r"), - startSample("S\r"), + DIAGNOSTICS_COMMAND("D\r"), + START_SAMPLE("S\r"), PRINT_COMMAND("P\r"), - getDeviceId("I\r"), + DEVICE_CONFIGURATION_COMMAND("I\r"), FIRST_GAIN_COMMAND("T\r"), SECOND_GAIN_COMMAND("U\r"), THIRD_GAIN_COMMAND("V\r"), diff --git a/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt index 0fd02d1..24e73bf 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt @@ -3,7 +3,6 @@ package com.example.hpostesting.presentation.autodac import android.content.Context import android.content.SharedPreferences import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -13,16 +12,11 @@ import androidx.fragment.app.activityViewModels import androidx.lifecycle.MutableLiveData 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.presentation.UsbServiceListener import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase import `in`.sminnovations.hpostesting.databinding.FragmentAutoDacBinding -import `in`.sminnovations.hpostesting.databinding.FragmentDiagnosticsBinding -import java.text.SimpleDateFormat -import java.util.Calendar -import java.util.Locale class AutoDacFragment: Fragment() { @@ -86,7 +80,7 @@ class AutoDacFragment: Fragment() { private fun getDeviceId() { autoDacViewModel.progressBar.postValue(true) (activity as AutoDacActivity).mService.sendAndListenToHemoCube( - HemoCubeCommands.getDeviceId, + HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) { data?.let { 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 c4a7aba..efcd02a 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 @@ -439,7 +439,7 @@ class HemoCubeBufferCheckFragment : Fragment() { binding.btnPlacebuffer.visibility = View.GONE } - (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startBuffer, + (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_BUFFER_COMMAND, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) {} @@ -453,7 +453,7 @@ class HemoCubeBufferCheckFragment : Fragment() { binding.btnPlacebuffer.visibility = View.GONE } - (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startSample, + (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_SAMPLE, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) {} @@ -465,7 +465,7 @@ class HemoCubeBufferCheckFragment : Fragment() { private fun getDeviceInfo() { hemoCubeViewModel.progressBar.postValue(true) (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube( - HemoCubeCommands.getDeviceId, + HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) { data?.let { diff --git a/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt index 764cd44..6b95ccc 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt @@ -79,7 +79,7 @@ class CalibrationFragment: Fragment() { private fun getDeviceId() { calibrationViewModel.progressBar.postValue(true) (activity as CalibrationActivity).mService.sendAndListenToHemoCube( - HemoCubeCommands.getDeviceId, + HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) { data?.let { diff --git a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt index e3bcf55..a1a5c5d 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt @@ -117,7 +117,7 @@ class DeviceProvisionFragment : Fragment() { private fun getDeviceId() { (activity as DeviceProvisionActivity).mService.sendAndListenToHemoCube( - HemoCubeCommands.getDeviceId, + HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) {} override fun onUsbError(e: Exception?) {} 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 fd48f9e..fb4ddcb 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 @@ -86,7 +86,7 @@ class DiagnosticsFragment : Fragment() { private fun getDeviceId() { diagnosticsViewModel.progressBar.postValue(true) (activity as DiagnosticsActivity).mService.sendAndListenToHemoCube( - HemoCubeCommands.getDeviceId, + HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) { data?.let { @@ -104,7 +104,7 @@ class DiagnosticsFragment : Fragment() { private fun runDeviceDiagnostics() { diagnosticsViewModel.progressBar.postValue(true) (activity as DiagnosticsActivity).mService.sendAndListenToHemoCube( - HemoCubeCommands.runDiagnostics, + HemoCubeCommands.DIAGNOSTICS_COMMAND, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) { diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt index 1e55195..ed29f8e 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt @@ -347,7 +347,7 @@ class HemoCubeFragment : Fragment() { private fun getDeviceInfo() { hemoCubeViewModel.progressBar.postValue(true) (activity as HemocubeActivity).mService.sendAndListenToHemoCube( - HemoCubeCommands.getDeviceId, + HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) { data?.let { @@ -598,23 +598,6 @@ class HemoCubeFragment : Fragment() { } } - private fun showError() { - activity?.runOnUiThread { - UIUtils.createAlertDialog(requireContext(), - "Device Error", - "Something is wrong with the device, please disconnect and reconnect the device and test the user again", - getString(R.string.noo), - "Yes", - object : MyDialogListener { - override fun onClickNegativeButton() {} - - override fun onClickPositiveButton() { - startActivity(Intent(requireActivity(), DashboardActivity::class.java)) - } - }) - } - } - fun handleBackButtonPress() { if (isTestOngoing) { showToast(R.string.test_go_noback) @@ -952,7 +935,7 @@ class HemoCubeFragment : Fragment() { binding.btnPlacebuffer.visibility = View.GONE } - (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startBuffer, + (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_BUFFER_COMMAND, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) {} @@ -966,7 +949,7 @@ class HemoCubeFragment : Fragment() { testingTrace.start() hemoCubeViewModel.progressBar.postValue(true) - (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startSample, + (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_SAMPLE, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) {}