diff --git a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt index 4a2778d..76ab33c 100644 --- a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt +++ b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt @@ -5,6 +5,7 @@ import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase import androidx.room.TypeConverters +import com.example.hpostesting.data.model.patient.DeviceData import com.example.hpostesting.data.model.patient.UserData import com.example.hpostesting.data.model.patient.HemoCubeTestData import com.google.android.datatransport.runtime.dagger.Provides diff --git a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt index b6a4fb8..497100e 100644 --- a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt +++ b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt @@ -6,6 +6,7 @@ import androidx.room.Room import com.example.hpostesting.data.dao.MyDatabase import com.example.hpostesting.data.model.PendingUploads import com.example.hpostesting.data.model.Response +import com.example.hpostesting.data.model.patient.DeviceData import com.example.hpostesting.data.model.patient.HemoCubeTestData import com.example.hpostesting.data.model.patient.UserData import com.google.android.datatransport.runtime.dagger.Provides @@ -13,7 +14,9 @@ import com.google.firebase.firestore.FirebaseFirestore import com.google.firebase.firestore.ktx.firestore import com.google.firebase.ktx.Firebase import com.google.firebase.storage.ktx.storage +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.tasks.await +import kotlinx.coroutines.withContext import java.io.File import javax.inject.Singleton @@ -112,4 +115,8 @@ class DatabaseRepository : Repository { Response.Error(e) } } + + suspend fun getDeviceDataById(): List { + return db.collection("devices").get().await().toObjects(DeviceData::class.java) + } } \ No newline at end of file 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 3fe5fee..beea992 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 @@ -15,6 +15,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import com.example.hpostesting.data.DataHolder import com.example.hpostesting.data.constant.HemoCubeCommands +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.utils.MyDialogListener @@ -35,6 +36,8 @@ class HemoCubeFragment : Fragment() { private val ACTION_USB_PERMISSION = "com.example.usbpermission" private val TIMEOUT = 0 + private var deviceData = listOf() + private val usbManager: UsbManager by lazy { requireContext().getSystemService(Context.USB_SERVICE) as UsbManager } @@ -67,6 +70,12 @@ class HemoCubeFragment : Fragment() { binding.progressBar.visibility = View.GONE } + hemoCubeViewModel.getDeviceData() + + hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) { + deviceData = it + } + hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable -> apply { kitSerial = DataHolder.hemoCubeTestData?.kitSerial @@ -188,6 +197,10 @@ class HemoCubeFragment : Fragment() { Log.d("greenBuffer", blueIntensity.toString()) Log.d("greenBuffer", blueBIntensity.toString()) } + + private fun calculateResult() { + hemoCubeViewModel + } private fun fetchHemoCubeResult() { if (DataHolder.hemoCubeTestData == null) { DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData() diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt index d0c02c9..e30bd2f 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt @@ -10,6 +10,7 @@ import com.example.hpostesting.data.DataHolder import com.example.hpostesting.data.NetworkStatusLiveData import com.example.hpostesting.data.dao.HemoCubeDao import com.example.hpostesting.data.model.Response +import com.example.hpostesting.data.model.patient.DeviceData import com.example.hpostesting.data.model.patient.toHemoCubeTestData import com.example.hpostesting.data.repository.DatabaseRepository import dagger.hilt.android.lifecycle.HiltViewModel @@ -29,6 +30,7 @@ class HemoCubeViewModel @Inject constructor( val progressBar = MutableLiveData(false) val testDetails = DataHolder.selectedTest?.toHemoCubeTestData() private val _networkStatusLiveData = NetworkStatusLiveData(context) + val deviceData = MutableLiveData>() val networkStatusLiveData: LiveData get() = _networkStatusLiveData val fireBaseUpload = MutableLiveData() @@ -61,6 +63,12 @@ class HemoCubeViewModel @Inject constructor( } } + fun getDeviceData() = viewModelScope.launch { + repository.getDeviceDataById().let { + deviceData.postValue(it) + } + } + private fun addResultTestToDb() { testDetails?.deviceRatio = DataHolder.hemocubeResult testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()