From 0faf4adbd705e1b29eea8614d40f5e97f00e02f6 Mon Sep 17 00:00:00 2001
From: Mariya <mariya@sminnovations.in>
Date: Tue, 26 Dec 2023 12:59:44 +0530
Subject: [PATCH 1/5] ADDED CODE FOR Changing Text color from red to green if
 the result is normal

---
 .../hpostesting/presentation/hemocube/HemoCubeFragment.kt  | 7 +++++++
 app/src/main/res/values/colors.xml                         | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

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 7128812..7951693 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
@@ -9,6 +9,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
@@ -604,6 +605,9 @@ class HemoCubeFragment : Fragment() {
                 if (calculatedRatio < 0.05)
                     return getString(R.string.error_repeat_test_higher_volume)
                 if (calculatedRatio in 0.05..0.155)
+                    activity?.runOnUiThread {
+                        binding.tvSubtitle4.setTextColor(ContextCompat.getColor(requireContext(), R.color.brightGreen))
+                    }
                     return getString(R.string.normal)
                 if (calculatedRatio in 0.155..0.175)
                     return getString(R.string.negative_borderline)
@@ -631,6 +635,9 @@ class HemoCubeFragment : Fragment() {
             hemoCubeViewModel.messages.postValue("result classification")
             if (predictedDenovixRatio != null) {
                 if (predictedDenovixRatio in 0.0..0.16)
+                    activity?.runOnUiThread {
+                        binding.tvSubtitle4.setTextColor(ContextCompat.getColor(requireContext(), R.color.brightGreen))
+                    }
                     return getString(R.string.normal)
                 if (predictedDenovixRatio in 0.16..0.165)
                     return getString(R.string.negative_borderline)
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5af8330..c33ea7c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,6 +9,8 @@
     <color name="white">#FFFFFFFF</color>
     <color name="gray">#808080</color>
 
+    <color name="brightGreen">#00FF00</color>
+    <color name="red">#FF0000</color>
     <color name="blue_app">#4daaff</color>
     <color name="blue_app_dark">#005db3</color>
     <color name="blue_app_light">#e5f3ff</color>
@@ -17,7 +19,7 @@
         <color name="primary">#4daaff</color>
         <color name="primary_dark">#005db3</color>
         <color name="primary_light">#e5f3ff</color>
-        <color name="red">#FF0000</color>
+
 
 
 

From 00a3124fbff6060e08e4582d55cb3c6a8ce10ba8 Mon Sep 17 00:00:00 2001
From: Kaif <mohamedkaif@sminnovations.in>
Date: Tue, 26 Dec 2023 14:16:19 +0530
Subject: [PATCH 2/5] API call for DeviceProvision and Login is completed and
 tested

---
 .idea/gradle.xml                              |   1 +
 app/src/main/assets/app.properties            |   1 +
 .../example/hpostesting/data/FileUploader.kt  |  46 --
 .../com/example/hpostesting/data/Result.kt    |   7 +
 .../example/hpostesting/data/api/HPOSApi.kt   |  41 ++
 .../hpostesting/data/api/PropertyProvider.kt  |   6 +
 .../hpostesting/data/constant/Constants.kt    |  13 +
 .../data/model/deviceprovision/Credentials.kt |   6 +
 .../data/model/deviceprovision/Device.kt      |  17 +
 .../deviceprovision/DeviceProvisionData.kt    |   6 +
 .../deviceprovision/DeviceProvisionRequest.kt |   9 +
 .../DeviceProvisionResponse.kt                |  12 +
 .../data/model/deviceprovision/DeviceType.kt  |  12 +
 .../data/model/deviceprovision/DeviceUser.kt  |  15 +
 .../data/model/hpostest/HPOSV2TestResult.kt   |   6 +
 .../data/model/hpostest/RawData.kt            |  55 +++
 .../hpostesting/data/model/hpostest/Result.kt |  36 ++
 .../hpostesting/data/model/login/Device.kt    |  16 +
 .../data/model/login/DeviceType.kt            |  12 +
 .../data/model/login/DeviceUser.kt            |  16 +
 .../hpostesting/data/model/login/LoginData.kt |   6 +
 .../data/model/login/LoginRequest.kt          |  12 +
 .../data/model/login/LoginResponse.kt         |  12 +
 .../data/model/test/TestDetails.kt            |  55 ---
 .../hpostesting/data/model/test/TestInfo.kt   |  11 -
 .../data/repository/DatabaseRepository.kt     |  32 +-
 .../hpostesting/domain/di/AppModule.kt        |  50 +-
 .../presentation/dashboard/HomeFragment.kt    |  55 ++-
 .../dashboard/ui/LoginFragment.kt             |   3 +-
 .../hemocube/HemoCubeViewModel.kt             | 458 +++++++++---------
 .../hpostesting/util/PropertyProviderImpl.kt  |  15 +
 31 files changed, 697 insertions(+), 345 deletions(-)
 create mode 100644 app/src/main/assets/app.properties
 delete mode 100644 app/src/main/java/com/example/hpostesting/data/FileUploader.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/Result.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/api/HPOSApi.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/api/PropertyProvider.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/hpostest/HPOSV2TestResult.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/hpostest/RawData.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/hpostest/Result.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/login/Device.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt
 delete mode 100644 app/src/main/java/com/example/hpostesting/data/model/test/TestDetails.kt
 delete mode 100644 app/src/main/java/com/example/hpostesting/data/model/test/TestInfo.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/util/PropertyProviderImpl.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cb865f6..9f47dfb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
diff --git a/app/src/main/assets/app.properties b/app/src/main/assets/app.properties
new file mode 100644
index 0000000..026616a
--- /dev/null
+++ b/app/src/main/assets/app.properties
@@ -0,0 +1 @@
+BASE_URL= https://datacollection.micropcr.com/api/
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/FileUploader.kt b/app/src/main/java/com/example/hpostesting/data/FileUploader.kt
deleted file mode 100644
index e76d929..0000000
--- a/app/src/main/java/com/example/hpostesting/data/FileUploader.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.example.hpostesting.data
-
-import android.util.Log
-import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.util.MyUtils
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-
-class FileUploader {
-
-    private val TAG = "FileUploader"
-    val repository = DatabaseRepository()
-
-    suspend fun start() {
-
-        val listOfFiles = repository.getAllFromPendingQueue()
-
-        for (each in listOfFiles){
-            // Checking internet connectivity & mobile as same or not
-            if (MyUtils.isInternetConnected() && each.mobileId == DataHolder.mobileUniqueId) {
-
-                Log.d(TAG, "uploading file ${each.pendingId}")
-                GlobalScope.launch {
-                    val response = repository.uploadFileToStorage(each.patientId, each.filePath)
-
-                    when (response) {
-                        is Response.Success -> {
-                            Log.d(TAG, "File Uploaded ${each.pendingId}")
-                            repository.removeFromPendingQueue(each.pendingId)
-                        }
-
-                        is Response.Error -> {
-                            Log.d(TAG, response.exception.toString())
-                        }
-                    }
-                }.join()
-
-            } else {
-                return
-            }
-        }
-        return
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/Result.kt b/app/src/main/java/com/example/hpostesting/data/Result.kt
new file mode 100644
index 0000000..035aa23
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/Result.kt
@@ -0,0 +1,7 @@
+package com.example.hpostesting.data
+
+sealed class Result<out T : Any> {
+    data class Success<out T : Any>(val data: T) : Result<T>()
+    data class Error(val exception: Exception) : Result<Nothing>()
+    class Loading<T : Any> : Result<T>()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/api/HPOSApi.kt b/app/src/main/java/com/example/hpostesting/data/api/HPOSApi.kt
new file mode 100644
index 0000000..a1ff1b0
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/api/HPOSApi.kt
@@ -0,0 +1,41 @@
+package com.example.hpostesting.data.api
+
+import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
+import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
+import com.example.hpostesting.data.model.hpostest.HPOSV2TestResult
+import com.example.hpostesting.data.model.login.LoginRequest
+import com.example.hpostesting.data.model.login.LoginResponse
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.Header
+import retrofit2.http.POST
+
+interface HPOSApi {
+
+    @POST("uploadResults/")
+    suspend fun uploadResults(
+        @Header("Authorization") accessToken: String,
+        @Body entry: HPOSV2TestResult
+    ): Response<Any>
+
+    @POST("deviceManagement/device/provision")
+    suspend fun deviceProvision(
+        @Body deviceProvisionRequest: DeviceProvisionRequest
+    ): DeviceProvisionResponse
+
+    @POST("deviceService/device/login")
+    suspend fun login(
+        @Body loginRequest: LoginRequest
+    ): LoginResponse
+
+    @POST("CheckUpdate/")
+    suspend fun checkUpdate(
+        @Body entry: HemoCubeTestData
+    ): Response<Any>
+
+    @POST("uploadLogs/")
+    suspend fun uploadLogs(
+        @Body entry: HemoCubeTestData
+    ): Response<Any>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/api/PropertyProvider.kt b/app/src/main/java/com/example/hpostesting/data/api/PropertyProvider.kt
new file mode 100644
index 0000000..5f55ac4
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/api/PropertyProvider.kt
@@ -0,0 +1,6 @@
+package com.example.hpostesting.data.api
+
+interface PropertyProvider {
+
+    fun getProperty(key: String): String
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
index 891c3a5..106e7a6 100644
--- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
@@ -4,8 +4,21 @@ object Constants {
     const val ACTION_USB_PERMISSION = "shanmukha.in.sickle_cell.USB_PERMISSION"
     const val HOMOCUBE_USB_PERMISSION = "shanmukha.in.sickle_cell_homocube.USB_PERMISSION"
 
+    const val BASE_URL = "www.google.com"
+
     const val ABHA_APP_PACKAGE = "in.ndhm.phr"
 
+    const val serialNumber = "NKH5555AH"
+    const val deviceTypeName = "HPOS"
+    const val uid = "NKH5555AH"
+    const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
+    const val deviceProvisionPassword = "f2ab0e7f9d69"
+    const val deviceID = "HCV-000-3001"
+    const val devicePassword = "810516d8f4c7"
+
+    const val ACCESS_TOKEN = "accessToken"
+    const val NATS_TOKEN = "natsToken"
+
     const val WRITE_TIMEOUT_MILLIS = 30000   // 30 sec
     const val READ_TIMEOUT_MILLIS = 60000   // 1 min
     const val DELAY_BETWEEN_COMMANDS: Long = 1000
diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt
new file mode 100644
index 0000000..f2ae2b4
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt
@@ -0,0 +1,6 @@
+package com.example.hpostesting.data.model.deviceprovision
+
+data class Credentials(
+    val password: String? = "",
+    val username: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt
new file mode 100644
index 0000000..c3cf0f7
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt
@@ -0,0 +1,17 @@
+package com.example.hpostesting.data.model.deviceprovision
+
+data class Device(
+    val assigned: Boolean? = false,
+    val createdAt: String? = "",
+    val createdBy: Int? = 0,
+    val deviceType: DeviceType? = DeviceType(),
+    val deviceTypeId: Int? = 0,
+    val deviceUser: DeviceUser? = DeviceUser(),
+    val enabled: Boolean? = false,
+    val id: Int? = 0,
+    val name: String? = "",
+    val serialNumber: String? = "",
+    val uid: String? = "",
+    val updatedAt: String? = "",
+    val updatedBy: Int? = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt
new file mode 100644
index 0000000..62cb97b
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt
@@ -0,0 +1,6 @@
+package com.example.hpostesting.data.model.deviceprovision
+
+data class DeviceProvisionData(
+    val credentials: Credentials? = Credentials(),
+    val device: Device? = Device()
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt
new file mode 100644
index 0000000..5847305
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt
@@ -0,0 +1,9 @@
+package com.example.hpostesting.data.model.deviceprovision
+
+data class DeviceProvisionRequest(
+    val deviceTypeName: String? = "",
+    val email: String? = "",
+    val password: String? = "",
+    val serialNumber: String? = "",
+    val uid: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt
new file mode 100644
index 0000000..821fea5
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt
@@ -0,0 +1,12 @@
+package com.example.hpostesting.data.model.deviceprovision
+
+import com.google.gson.annotations.SerializedName
+
+data class DeviceProvisionResponse(
+    @SerializedName("Data")
+    val data: DeviceProvisionData? = DeviceProvisionData(),
+    @SerializedName("Message")
+    val message: String? = "",
+    @SerializedName("Result")
+    val result: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt
new file mode 100644
index 0000000..096a0e4
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt
@@ -0,0 +1,12 @@
+package com.example.hpostesting.data.model.deviceprovision
+
+data class DeviceType(
+    val createdAt: String? = "",
+    val createdBy: Int? = 0,
+    val description: String? = "",
+    val enabled: Boolean? = false,
+    val id: Int? = 0,
+    val name: String? = "",
+    val updatedAt: String? = "",
+    val updatedBy: Int? = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt
new file mode 100644
index 0000000..488fd08
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt
@@ -0,0 +1,15 @@
+package com.example.hpostesting.data.model.deviceprovision
+
+data class DeviceUser(
+    val createdAt: String? = "",
+    val createdBy: Int? = 0,
+    val deviceId: Int? = 0,
+    val enabled: Boolean? = false,
+    val id: Int? = 0,
+    val lastLogin: Any? = Any(),
+    val natsToken: String? = "",
+    val natsTokenExpiry: String? = "",
+    val updatedAt: String? = "",
+    val updatedBy: Int? = 0,
+    val username: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/hpostest/HPOSV2TestResult.kt b/app/src/main/java/com/example/hpostesting/data/model/hpostest/HPOSV2TestResult.kt
new file mode 100644
index 0000000..087f82a
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/hpostest/HPOSV2TestResult.kt
@@ -0,0 +1,6 @@
+package com.example.hpostesting.data.model.hpostest
+
+data class HPOSV2TestResult(
+    val device_id: String? = "",
+    val results: List<Result?>? = listOf()
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/hpostest/RawData.kt b/app/src/main/java/com/example/hpostesting/data/model/hpostest/RawData.kt
new file mode 100644
index 0000000..e4641c5
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/hpostest/RawData.kt
@@ -0,0 +1,55 @@
+package com.example.hpostesting.data.model.hpostest
+
+import com.example.hpostesting.data.model.patient.UserData
+
+data class RawData(
+    var _id: String = "",
+    var name: String = "",
+    var incubationTime: String = "",
+    var bloodGroup: String = "",
+    var birthYear: String = "",
+    var state: String = "",
+    var abhaId: String = "",
+    var userImageURL: String = "",
+    var location: UserData.Location? = null,
+    var reportUploadTime: String? = "",
+    var testType: String? = "HEMOCUBE",
+    var testTime: String? = "",
+    var testStatus: Boolean? = false,
+    var gender: String = "",
+    var localFlag: Boolean = false,
+    var deviceId: String? = "",
+    var appVersion:String? = "",
+    var deviceSerialNumber: String = "",
+    var deviceType: String = "HEMOCUBE",
+    var kitSerial: String = "",
+    var resultData: String = "",
+    var led1Buffer: Double? = null,
+    var led2Buffer: Double? = null,
+    var led3Buffer: Double? = null,
+    var led4Buffer: Double? = null,
+    var led1Sample: Double? = null,
+    var led2Sample: Double? = null,
+    var led3Sample: Double? = null,
+    var led4Sample: Double? = null,
+    var led1Average: Double? = null,
+    var led2Average: Double? = null,
+    var led3Average: Double? = null,
+    var led4Average: Double? = null,
+    var abs1: Double? = null,
+    var abs2: Double? = null,
+    var abs3: Double? = null,
+    var abs4: Double? = null,
+    var deviceRatio: Double? = null,
+    var calculatedRatio: Double? = null,
+    var predictedDenovixRatio: Double? = null,
+    var coefficients: String? = "",
+    var classificationResult: String = "",
+    var prdClassification: String = "",
+    var errorMessages: String = "",
+    var batteryLevel: String = "",
+    var batteryCapacity: String = "",
+    var batteryMaxCapacity: String = "",
+    var batteryTemperature: String = "",
+    var batteryVoltage: String = "",
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/hpostest/Result.kt b/app/src/main/java/com/example/hpostesting/data/model/hpostest/Result.kt
new file mode 100644
index 0000000..ae1b092
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/hpostest/Result.kt
@@ -0,0 +1,36 @@
+package com.example.hpostesting.data.model.hpostest
+
+data class Result(
+    val age: String? = "",
+    val analysis_date: String? = "",
+    val analysis_id: String? = "",
+    val analysis_status: String? = "",
+    val analysis_type: String? = "",
+    val analysis_type_method: String? = "",
+    val blood_group: String? = "",
+    val coefficients: List<Any?>? = listOf(),
+    val collection_location: List<Any?>? = listOf(),
+    val collection_time: String? = "",
+    val collector: String? = "",
+    val curve_fitting: String? = "",
+    val device_id: String? = "",
+    val device_name: String? = "",
+    val expiry_time: String? = "",
+    val gender: String? = "",
+    val interpretation: String? = "",
+    val patient_id: String? = "",
+    val pregnancy: Boolean? = false,
+    val raw_data: RawData? = RawData(),
+    val recommendation: String? = "",
+    val sample_id: String? = "",
+    val sample_type: String? = "",
+    val sickle_cell_history: Boolean? = false,
+    val test_id: String? = "",
+    val test_result: String? = "",
+    val test_status: String? = "",
+    val test_time: String? = "",
+    val test_type: String? = "",
+    val thresholds: String? = "",
+    val under_medication: Boolean? = false,
+    val volume: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/Device.kt b/app/src/main/java/com/example/hpostesting/data/model/login/Device.kt
new file mode 100644
index 0000000..8f67ed1
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/Device.kt
@@ -0,0 +1,16 @@
+package com.example.hpostesting.data.model.login
+
+data class Device(
+    val assigned: Boolean? = false,
+    val createdAt: String? = "",
+    val createdBy: Int? = 0,
+    val deviceType: DeviceType? = DeviceType(),
+    val deviceTypeId: Int? = 0,
+    val enabled: Boolean? = false,
+    val id: Int? = 0,
+    val name: String? = "",
+    val serialNumber: String? = "",
+    val uid: String? = "",
+    val updatedAt: String? = "",
+    val updatedBy: Int? = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt b/app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt
new file mode 100644
index 0000000..6ce0dca
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt
@@ -0,0 +1,12 @@
+package com.example.hpostesting.data.model.login
+
+data class DeviceType(
+    val createdAt: String? = "",
+    val createdBy: Int? = 0,
+    val description: String? = "",
+    val enabled: Boolean? = false,
+    val id: Int? = 0,
+    val name: String? = "",
+    val updatedAt: String? = "",
+    val updatedBy: Int? = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt b/app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt
new file mode 100644
index 0000000..acb57ae
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt
@@ -0,0 +1,16 @@
+package com.example.hpostesting.data.model.login
+
+data class DeviceUser(
+    val createdAt: String? = "",
+    val createdBy: Int? = 0,
+    val device: Device? = Device(),
+    val deviceId: Int? = 0,
+    val enabled: Boolean? = false,
+    val id: Int? = 0,
+    val lastLogin: String? = "",
+    val natsToken: String? = "",
+    val natsTokenExpiry: String? = "",
+    val updatedAt: String? = "",
+    val updatedBy: Int? = 0,
+    val username: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt b/app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt
new file mode 100644
index 0000000..37af05f
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt
@@ -0,0 +1,6 @@
+package com.example.hpostesting.data.model.login
+
+data class LoginData(
+    val accessToken: String? = "",
+    val deviceUser: DeviceUser? = DeviceUser()
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt b/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt
new file mode 100644
index 0000000..cdf7f3d
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt
@@ -0,0 +1,12 @@
+package com.example.hpostesting.data.model.login
+
+data class LoginRequest(
+    val lab: String? = "",
+    val latitude: String? = "",
+    val location: String? = "",
+    val longitude: String? = "",
+    val mode: String? = "",
+    val password: String? = "",
+    val serialNumber: String? = "",
+    val username: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt b/app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt
new file mode 100644
index 0000000..fa4eeba
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt
@@ -0,0 +1,12 @@
+package com.example.hpostesting.data.model.login
+
+import com.google.gson.annotations.SerializedName
+
+data class LoginResponse(
+    @SerializedName("Data")
+    val data: LoginData? = LoginData(),
+    @SerializedName("Message")
+    val message: String? = "",
+    @SerializedName("Result")
+    val result: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/test/TestDetails.kt b/app/src/main/java/com/example/hpostesting/data/model/test/TestDetails.kt
deleted file mode 100644
index 5f0260b..0000000
--- a/app/src/main/java/com/example/hpostesting/data/model/test/TestDetails.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.example.hpostesting.data.model.test
-
-import com.example.hpostesting.data.model.Location
-import java.util.Date
-
-data class TestDetails(
-    val testID: String,
-    var testStatus: Status,
-    val patientID: String,
-    val patientName: String,
-    val patientAge: Int?,
-
-    var resultRatio: Double?,
-    var result: TestRightResultType?,
-
-    val reportPath: String?,
-    val csvPath: String?,
-    val logPath: String?,
-
-    // Meta Data
-    var deviceId: String?,
-    val mobileId: String,
-    var kitSerial: String?,
-    val location: Location?,
-    val appVersion: String,
-
-    val registeredTime: Date?,
-    var uploadTime: Date?
-) {
-    constructor() : this(
-        "",
-        Status.PENDING,
-        "",
-        "",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "",
-        null,
-        null,
-        "",
-        null,
-        null
-    )
-}
-
-enum class Status {
-    COMPLETED,
-    PENDING,
-    INPROGRESS
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/test/TestInfo.kt b/app/src/main/java/com/example/hpostesting/data/model/test/TestInfo.kt
deleted file mode 100644
index 8a5ff3b..0000000
--- a/app/src/main/java/com/example/hpostesting/data/model/test/TestInfo.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.example.hpostesting.data.model.test
-
-data class TestInfo(
-    val value: String,
-    val number1: String,
-    val number2: String,
-    val result: String,
-    val resultConfirmatory: String,
-    val directoryPath: String,
-    val fullPath: String
-)
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 728aa3d..44c0767 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
@@ -1,6 +1,7 @@
 package com.example.hpostesting.data.repository
 
 import android.net.Uri
+import com.example.hpostesting.data.api.HPOSApi
 import com.example.hpostesting.data.model.PendingUploads
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
@@ -15,13 +16,42 @@ import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.ktx.storage
 import kotlinx.coroutines.tasks.await
 import java.io.File
+import com.example.hpostesting.data.Result
+import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
+import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
+import com.example.hpostesting.data.model.login.LoginRequest
+import com.example.hpostesting.data.model.login.LoginResponse
+import java.net.ConnectException
+import java.net.SocketTimeoutException
 import javax.inject.Inject
 
-class DatabaseRepository @Inject constructor() : Repository {
+class NetworkException(message: String, cause: Throwable) : Exception(message, cause)
+class DatabaseRepository @Inject constructor(private val hposApi: HPOSApi) : Repository {
 
     private val db: FirebaseFirestore = Firebase.firestore
     private val storage = Firebase.storage
 
+    private suspend fun <T : Any> safeApiCall(apiCall: suspend () -> T): Result<T> {
+        return try {
+            val response = apiCall.invoke()
+            Result.Success(response)
+        } catch (e: SocketTimeoutException) {
+            Result.Error(NetworkException("Network timeout", e))
+        } catch (e: ConnectException) {
+            Result.Error(NetworkException("Network connection failed", e))
+        } catch (e: Exception) {
+            Result.Error(e)
+        }
+    }
+
+    suspend fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest): Result<DeviceProvisionResponse> {
+        return safeApiCall { hposApi.deviceProvision(deviceProvisionRequest) }
+    }
+
+    suspend fun login(loginRequest: LoginRequest): Result<LoginResponse> {
+        return safeApiCall { hposApi.login(loginRequest) }
+    }
+
     override suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
         return try {
             val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
diff --git a/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt b/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
index 3c4b5ce..8f8e3fe 100644
--- a/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
@@ -2,7 +2,11 @@ package com.example.hpostesting.domain.di
 
 import android.app.Application
 import android.content.Context
+import android.content.res.AssetManager
 import androidx.room.Room
+import com.example.hpostesting.data.api.HPOSApi
+import com.example.hpostesting.data.api.PropertyProvider
+import com.example.hpostesting.data.constant.Constants.BASE_URL
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
 import com.example.hpostesting.data.dao.UserDao
@@ -12,11 +16,15 @@ import com.example.hpostesting.data.repository.LocalFileRepository
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
+import com.example.hpostesting.util.PropertyProviderImpl
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
 import javax.inject.Singleton
 
 @Module
@@ -67,13 +75,47 @@ object AppModule {
 
     @Provides
     @Singleton
-    fun provideDatabaseRepository(): DatabaseRepository {
-        return DatabaseRepository()
+    fun provideDatabaseRepository(hposApi: HPOSApi): DatabaseRepository {
+        return DatabaseRepository(hposApi = hposApi)
     }
 
     @Provides
     @Singleton
-    fun provideRepository(): Repository {
-        return DatabaseRepository()
+    fun provideRepository(hposApi: HPOSApi): Repository {
+        return DatabaseRepository(hposApi)
     }
+
+    @Provides
+    @Singleton
+    fun provideAssetManager(@ApplicationContext context: Context): AssetManager {
+        return context.assets
+    }
+
+    @Provides
+    @Singleton
+    fun providePropertyProvider(assetManager: AssetManager): PropertyProvider {
+        return PropertyProviderImpl(assetManager)
+    }
+
+    @Provides
+    @Singleton
+    fun provideOkHttpClient(): OkHttpClient {
+        return OkHttpClient.Builder()
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideRetrofit(propertyProvider: PropertyProvider, client: OkHttpClient): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(propertyProvider.getProperty("BASE_URL"))
+            .client(client)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideEntryApi(retrofit: Retrofit): HPOSApi =
+        retrofit.create(HPOSApi::class.java)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
index f714436..46c0eaf 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
@@ -16,7 +16,10 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.model.login.LoginRequest
+import com.example.hpostesting.data.model.login.LoginResponse
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.presentation.KitScanActivity
@@ -98,6 +101,7 @@ class HomeFragment : Fragment() {
                 loadUserData()
                 setSearch()
                 checkForLocalDBData()
+                checkForToken()
             } else {
                 binding.internetAvailableCL.visibility = View.GONE
                 binding.internetNotAvailableCL.visibility = View.VISIBLE
@@ -134,6 +138,51 @@ class HomeFragment : Fragment() {
         }
     }
 
+    private fun checkForToken() {
+        if (sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
+                .isEmpty() && sharedPreference.getString(Constants.NATS_TOKEN, "").toString()
+                .isEmpty()
+        ) {
+            hemoCubeViewModel.login(createLoginRequestData())
+        }
+        hemoCubeViewModel.loginResponse.observe(viewLifecycleOwner) { response ->
+            when (response) {
+                is Result.Success -> {
+                    updateTokens(response)
+                }
+
+                is Result.Error -> {
+                    response.exception.let { message ->
+                        Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
+                            .show()
+                    }
+                }
+
+                is Result.Loading -> {
+
+                }
+
+                else -> {}
+            }
+        }
+    }
+
+    private fun updateTokens(response: Result.Success<LoginResponse>) {
+        with(sharedPreference.edit()) {
+            putString(Constants.ACCESS_TOKEN, response.data.data?.accessToken)
+            putString(Constants.NATS_TOKEN, response.data.data?.deviceUser?.natsToken)
+            apply()
+        }
+    }
+
+    private fun createLoginRequestData(): LoginRequest {
+        return LoginRequest(
+            password = Constants.devicePassword,
+            serialNumber = Constants.deviceID,
+            username = Constants.deviceID
+        )
+    }
+
     private fun setUserId() {
         binding.btnSubmit.setOnClickListener {
             val userId = binding.userId.text.toString()
@@ -141,7 +190,9 @@ class HomeFragment : Fragment() {
             if (userId.length >= 18 && !bloodGroup.equals("Select Blood Group") || !bloodGroup.isNullOrBlank()) {
                 hemoCubeViewModel.addUser(
                     HemoCubeTestData(
-                        _id = userId, bloodGroup = bloodGroup.toString(), incubationTime = SimpleDateFormat(
+                        _id = userId,
+                        bloodGroup = bloodGroup.toString(),
+                        incubationTime = SimpleDateFormat(
                             "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                         ).format(Calendar.getInstance().time).toString()
                     )
@@ -308,7 +359,7 @@ class HomeFragment : Fragment() {
 
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             val uploadDataVisibility =
-                if (userDataList.any { !it.localFlag && it.testStatus == true}) View.VISIBLE else View.GONE
+                if (userDataList.any { !it.localFlag && it.testStatus == true }) View.VISIBLE else View.GONE
             binding.uploadData.visibility = uploadDataVisibility
         }
     }
diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt
index cb74fd0..aa2d9df 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt
@@ -23,7 +23,8 @@ class LoginFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         _binding = FragmentLoginBinding.inflate(inflater, container, false)
-        sharedPreference = requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+        sharedPreference =
+            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         return binding.root
     }
 
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 f32fa04..da2fd98 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
@@ -1,13 +1,11 @@
 package com.example.hpostesting.presentation.hemocube
 
-import android.app.Application
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences
 import android.os.BatteryManager
 import android.util.Log
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -17,14 +15,18 @@ import com.example.hpostesting.data.NetworkStatusLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.model.Response
+import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
+import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.patient.BufferCheckData
 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.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.data.repository.DatabaseRepository
 import com.example.hpostesting.data.repository.Repository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import com.example.hpostesting.data.Result
+import com.example.hpostesting.data.model.login.LoginRequest
+import com.example.hpostesting.data.model.login.LoginResponse
+import com.example.hpostesting.data.repository.DatabaseRepository
 import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
 import java.util.Calendar
@@ -35,246 +37,252 @@ import javax.inject.Inject
 class HemoCubeViewModel @Inject constructor(
     private val hemoCubeDao: HemoCubeDao,
     private val repository: Repository,
-    context: Context,
+    private val databaseRepository: DatabaseRepository,
+    context: Context
 ) : ViewModel() {
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
-        val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
-        val messages = MutableLiveData<String>()
-        private val sharedPreference: SharedPreferences =
-            context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+    private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
+    val messages = MutableLiveData<String>()
+    private val sharedPreference: SharedPreferences =
+        context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
 
-        // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
+    val deviceProvisionResponse = MutableLiveData<Result<DeviceProvisionResponse>>()
 
-        private val _networkStatusLiveData = NetworkStatusLiveData(context)
-        val allUserData = hemoCubeDao.getAll()
-        val deviceData = MutableLiveData<DeviceData?>()
-        val networkStatusLiveData: LiveData<Boolean>
-            get() = _networkStatusLiveData
-        val deviceMessages = MutableLiveData<String?>()
-        val fireBaseUpload = MutableLiveData<String>()
-        val fireBaseBulkUpload = MutableLiveData<String>()
+    val loginResponse = MutableLiveData<Result<LoginResponse>>()
 
-        private val batteryStatus: Intent? =
-            IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
-                context.registerReceiver(null, ifilter)
-            }
+    // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
 
-        fun uploadHemoCubeResultToDatabase(
-            isOnline: Boolean,
-            testStatus: Boolean,
-            kitSerial: String?
-        ) =
-            viewModelScope.launch {
-                if (kitSerial != null) {
-                    testDetails?.kitSerial = kitSerial
-                }
-                testDetails?.testStatus = testStatus
+    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+    val allUserData = hemoCubeDao.getAll()
+    val deviceData = MutableLiveData<DeviceData?>()
+    val networkStatusLiveData: LiveData<Boolean>
+        get() = _networkStatusLiveData
+    val deviceMessages = MutableLiveData<String?>()
+    val fireBaseUpload = MutableLiveData<String>()
+    val fireBaseBulkUpload = MutableLiveData<String>()
 
-                try {
-                    if (isOnline) {
-                        parseData()
-                        addResultTestToDb()
-                    } else {
-                        parseData()
-                        testDetails?.testTime = SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                        ).format(Calendar.getInstance().time)
-                        hemoCubeDao.insertAll(testDetails!!)
-                        fireBaseUpload.postValue("Local")
-                    }
-                } catch (e: Exception) {
-                    Log.e("Testdb", "Upload failed: ${e.message}")
-                }
-            }
-
-
-        fun uploadHemoCubeResultToDatabaseforbuffercheckN(bufferCheckData: BufferCheckData) =
-            viewModelScope.launch {
-                addResultTestToDbforbuffercheck(bufferCheckData)
-            }
-
-        fun getDeviceData(deviceId: String?) = viewModelScope.launch {
-            deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
+    private val batteryStatus: Intent? =
+        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
+            context.registerReceiver(null, ifilter)
         }
 
-        private fun parseData() {
-            testDetails?.deviceRatio = DataHolder.hemocubeResult
-            testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
-            testDetails?.location = DataHolder.location
-            testDetails?.testTime = SimpleDateFormat(
-                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-            ).format(Calendar.getInstance().time)
-            testDetails?.appVersion = DataHolder.hemoCubeTestData?.appVersion
-            testDetails?.deviceId = DataHolder.hemoCubeTestData?.deviceId
-            testDetails?.deviceSerialNumber =
-                sharedPreference.getString(Constants.USER_ID, "").toString()
-            testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
-            testDetails?.led1Buffer = DataHolder.hemoCubeTestData?.led1Buffer
-            testDetails?.led2Buffer = DataHolder.hemoCubeTestData?.led2Buffer
-            testDetails?.led3Buffer = DataHolder.hemoCubeTestData?.led3Buffer
-            testDetails?.led4Buffer = DataHolder.hemoCubeTestData?.led4Buffer
-            testDetails?.led1Sample = DataHolder.hemoCubeTestData?.led1Sample
-            testDetails?.led2Sample = DataHolder.hemoCubeTestData?.led2Sample
-            testDetails?.led3Sample = DataHolder.hemoCubeTestData?.led3Sample
-            testDetails?.led4Sample = DataHolder.hemoCubeTestData?.led4Sample
-            testDetails?.led1Average = DataHolder.hemoCubeTestData?.led1Average
-            testDetails?.led2Average = DataHolder.hemoCubeTestData?.led2Average
-            testDetails?.led3Average = DataHolder.hemoCubeTestData?.led3Average
-            testDetails?.led4Average = DataHolder.hemoCubeTestData?.led4Average
-            testDetails?.abs1 = DataHolder.hemoCubeTestData?.abs1
-            testDetails?.abs2 = DataHolder.hemoCubeTestData?.abs2
-            testDetails?.abs3 = DataHolder.hemoCubeTestData?.abs3
-            testDetails?.abs4 = DataHolder.hemoCubeTestData?.abs4
-            testDetails?.deviceRatio = DataHolder.hemoCubeTestData?.deviceRatio
-            testDetails?.predictedDenovixRatio = DataHolder.hemoCubeTestData?.predictedDenovixRatio
-            testDetails?.calculatedRatio = DataHolder.hemoCubeTestData?.calculatedRatio
-            testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients
-            testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
-            testDetails?.prdClassification =
-                DataHolder.hemoCubeTestData?.prdClassification.toString()
-            testDetails?.batteryLevel = DataHolder.hemoCubeTestData?.batteryLevel.toString()
-            testDetails?.batteryCapacity = DataHolder.hemoCubeTestData?.batteryCapacity.toString()
-            testDetails?.batteryMaxCapacity =
-                DataHolder.hemoCubeTestData?.batteryMaxCapacity.toString()
-            testDetails?.batteryTemperature =
-                DataHolder.hemoCubeTestData?.batteryTemperature.toString()
-            testDetails?.batteryVoltage = DataHolder.hemoCubeTestData?.batteryVoltage.toString()
+    fun uploadHemoCubeResultToDatabase(
+        isOnline: Boolean, testStatus: Boolean, kitSerial: String?
+    ) = viewModelScope.launch {
+        if (kitSerial != null) {
+            testDetails?.kitSerial = kitSerial
         }
+        testDetails?.testStatus = testStatus
 
-        private fun addResultTestToDb() {
-            viewModelScope.launch {
-                try {
-                    testDetails!!.reportUploadTime = SimpleDateFormat(
-                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                    ).format(Calendar.getInstance().time)
-
-                    when (val response = repository.addTestToDatabase(testDetails)) {
-                        is Response.Success -> {
-                            val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
-                            with(sharedPreference.edit()) {
-                                putInt(Constants.KIT_COUNT, kitCount.plus(1))
-                                apply()
-                            }
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
-                            fireBaseUpload.postValue("Success")
-                            testDetails.localFlag = true
-                            hemoCubeDao.insertAll(testDetails)
-                        }
-
-                        is Response.Error -> {
-                            Log.e("Testdb", "Error uploading data to Firestore: $response")
-                            fireBaseUpload.postValue("Error")
-                            hemoCubeDao.insertAll(testDetails)
-                        }
-                    }
-                } catch (e: Exception) {
-                    Log.e("Testdb", "Exception during data upload: ${e.message}")
-                    fireBaseUpload.postValue("Error")
-                }
-            }
-        }
-
-
-        private fun addResultTestToDbforbuffercheck(bufferCheckData: BufferCheckData) {
-            viewModelScope.launch {
-                try {
-
-                    when (val response =
-                        repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
-                        is Response.Success -> {
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
-                            fireBaseUpload.postValue("Success")
-                        }
-
-                        is Response.Error -> {
-                            Log.e("Testdb", "Error uploading data to Firestore: $response")
-                            fireBaseUpload.postValue("Error")
-                        }
-                    }
-                } catch (e: Exception) {
-                    Log.e("Testdb", "Exception during data upload: ${e.message}")
-                    fireBaseUpload.postValue("Error")
-                }
-            }
-        }
-
-        fun bulkAddResultTestToDb(userData: HemoCubeTestData) {
-            viewModelScope.launch {
-                userData.reportUploadTime = SimpleDateFormat(
+        try {
+            if (isOnline) {
+                parseData()
+                addResultTestToDb()
+            } else {
+                parseData()
+                testDetails?.testTime = SimpleDateFormat(
                     "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                 ).format(Calendar.getInstance().time)
-                when (repository.addTestToDatabase(userData)) {
+                hemoCubeDao.insertAll(testDetails!!)
+                fireBaseUpload.postValue("Local")
+            }
+        } catch (e: Exception) {
+            Log.e("Testdb", "Upload failed: ${e.message}")
+        }
+    }
+
+    fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest) = viewModelScope.launch {
+        deviceProvisionResponse.postValue(Result.Loading())
+        databaseRepository.deviceProvision(deviceProvisionRequest).let {
+            deviceProvisionResponse.postValue(it)
+        }
+    }
+
+    fun login(loginRequest: LoginRequest) = viewModelScope.launch {
+        loginResponse.postValue(Result.Loading())
+        databaseRepository.login(loginRequest).let {
+            loginResponse.postValue(it)
+        }
+    }
+
+    fun uploadHemoCubeResultToDatabaseforbuffercheckN(bufferCheckData: BufferCheckData) =
+        viewModelScope.launch {
+            addResultTestToDbforbuffercheck(bufferCheckData)
+        }
+
+    fun getDeviceData(deviceId: String?) = viewModelScope.launch {
+        deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
+    }
+
+    private fun parseData() {
+        testDetails?.deviceRatio = DataHolder.hemocubeResult
+        testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
+        testDetails?.location = DataHolder.location
+        testDetails?.testTime = SimpleDateFormat(
+            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+        ).format(Calendar.getInstance().time)
+        testDetails?.appVersion = DataHolder.hemoCubeTestData?.appVersion
+        testDetails?.deviceId = DataHolder.hemoCubeTestData?.deviceId
+        testDetails?.deviceSerialNumber =
+            sharedPreference.getString(Constants.USER_ID, "").toString()
+        testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
+        testDetails?.led1Buffer = DataHolder.hemoCubeTestData?.led1Buffer
+        testDetails?.led2Buffer = DataHolder.hemoCubeTestData?.led2Buffer
+        testDetails?.led3Buffer = DataHolder.hemoCubeTestData?.led3Buffer
+        testDetails?.led4Buffer = DataHolder.hemoCubeTestData?.led4Buffer
+        testDetails?.led1Sample = DataHolder.hemoCubeTestData?.led1Sample
+        testDetails?.led2Sample = DataHolder.hemoCubeTestData?.led2Sample
+        testDetails?.led3Sample = DataHolder.hemoCubeTestData?.led3Sample
+        testDetails?.led4Sample = DataHolder.hemoCubeTestData?.led4Sample
+        testDetails?.led1Average = DataHolder.hemoCubeTestData?.led1Average
+        testDetails?.led2Average = DataHolder.hemoCubeTestData?.led2Average
+        testDetails?.led3Average = DataHolder.hemoCubeTestData?.led3Average
+        testDetails?.led4Average = DataHolder.hemoCubeTestData?.led4Average
+        testDetails?.abs1 = DataHolder.hemoCubeTestData?.abs1
+        testDetails?.abs2 = DataHolder.hemoCubeTestData?.abs2
+        testDetails?.abs3 = DataHolder.hemoCubeTestData?.abs3
+        testDetails?.abs4 = DataHolder.hemoCubeTestData?.abs4
+        testDetails?.deviceRatio = DataHolder.hemoCubeTestData?.deviceRatio
+        testDetails?.predictedDenovixRatio = DataHolder.hemoCubeTestData?.predictedDenovixRatio
+        testDetails?.calculatedRatio = DataHolder.hemoCubeTestData?.calculatedRatio
+        testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients
+        testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
+        testDetails?.prdClassification = DataHolder.hemoCubeTestData?.prdClassification.toString()
+        testDetails?.batteryLevel = DataHolder.hemoCubeTestData?.batteryLevel.toString()
+        testDetails?.batteryCapacity = DataHolder.hemoCubeTestData?.batteryCapacity.toString()
+        testDetails?.batteryMaxCapacity = DataHolder.hemoCubeTestData?.batteryMaxCapacity.toString()
+        testDetails?.batteryTemperature = DataHolder.hemoCubeTestData?.batteryTemperature.toString()
+        testDetails?.batteryVoltage = DataHolder.hemoCubeTestData?.batteryVoltage.toString()
+    }
+
+    private fun addResultTestToDb() {
+        viewModelScope.launch {
+            try {
+                testDetails!!.reportUploadTime = SimpleDateFormat(
+                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                ).format(Calendar.getInstance().time)
+
+                when (val response = repository.addTestToDatabase(testDetails)) {
                     is Response.Success -> {
-                        fireBaseBulkUpload.postValue("Success")
-                        updateLocalFlag(userData._id)
+                        val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
+                        with(sharedPreference.edit()) {
+                            putInt(Constants.KIT_COUNT, kitCount.plus(1))
+                            apply()
+                        }
+                        Log.i("Testdb", "Data uploaded to Firestore successfully")
+                        fireBaseUpload.postValue("Success")
+                        testDetails.localFlag = true
+                        hemoCubeDao.insertAll(testDetails)
                     }
 
-                    else -> {
-                        fireBaseBulkUpload.postValue("Error")
+                    is Response.Error -> {
+                        Log.e("Testdb", "Error uploading data to Firestore: $response")
+                        fireBaseUpload.postValue("Error")
+                        hemoCubeDao.insertAll(testDetails)
                     }
                 }
+            } catch (e: Exception) {
+                Log.e("Testdb", "Exception during data upload: ${e.message}")
+                fireBaseUpload.postValue("Error")
+            }
+        }
+    }
+
+    private fun addResultTestToDbforbuffercheck(bufferCheckData: BufferCheckData) {
+        viewModelScope.launch {
+            try {
+
+                when (val response = repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
+                    is Response.Success -> {
+                        Log.i("Testdb", "Data uploaded to Firestore successfully")
+                        fireBaseUpload.postValue("Success")
+                    }
+
+                    is Response.Error -> {
+                        Log.e("Testdb", "Error uploading data to Firestore: $response")
+                        fireBaseUpload.postValue("Error")
+                    }
+                }
+            } catch (e: Exception) {
+                Log.e("Testdb", "Exception during data upload: ${e.message}")
+                fireBaseUpload.postValue("Error")
+            }
+        }
+    }
+
+    fun bulkAddResultTestToDb(userData: HemoCubeTestData) {
+        viewModelScope.launch {
+            userData.reportUploadTime = SimpleDateFormat(
+                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+            ).format(Calendar.getInstance().time)
+            when (repository.addTestToDatabase(userData)) {
+                is Response.Success -> {
+                    fireBaseBulkUpload.postValue("Success")
+                    updateLocalFlag(userData._id)
+                }
+
+                else -> {
+                    fireBaseBulkUpload.postValue("Error")
+                }
             }
         }
-
-        private fun updateLocalFlag(userId: String) = viewModelScope.launch {
-            hemoCubeDao.updateFieldById(id = userId, true)
-        }
-
-        fun addUser(userData: HemoCubeTestData) = viewModelScope.launch {
-            hemoCubeDao.insertAll(userData)
-        }
-
-        fun deleteById(userId: String) = viewModelScope.launch {
-            hemoCubeDao.deleteById(id = userId)
-        }
-
-        fun getBatteryLevel(): Float? {
-            val batteryPct: Float? = batteryStatus?.let { intent ->
-                val level: Int = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1)
-                val scale: Int = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1)
-                level * 100 / scale.toFloat()
-            }
-
-            return batteryPct
-        }
-
-        fun getBatteryTemperature(): Float? {
-            val batteryTemp: Float? = batteryStatus?.let { intent ->
-                val temperature = intent?.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0) ?: 0
-                temperature.toFloat() / 10
-            }
-
-            return batteryTemp
-        }
-
-        fun getBatteryVoltage(context: Context): Float {
-            val batteryIntent =
-                context.registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
-            val voltage = batteryIntent?.getIntExtra(BatteryManager.EXTRA_VOLTAGE, 0) ?: 0
-
-            // milli-volts to volts
-            return voltage.toFloat() / 1000
-        }
-
-        fun getBatteryCapacity(context: Context): Int {
-            val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-            val currentCapacity =
-                batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-
-            return currentCapacity
-        }
-
-        fun getBatteryMaxCapacity(context: Context): Float {
-            val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-            val designCapacity =
-                batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-            val currentCapacity =
-                batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-
-            // Calculate the estimated maximum battery capacity in mAh
-            val maxCapacity = currentCapacity.toFloat() / designCapacity.toFloat() * 100
-
-            return maxCapacity
-        }
     }
+
+    private fun updateLocalFlag(userId: String) = viewModelScope.launch {
+        hemoCubeDao.updateFieldById(id = userId, true)
+    }
+
+    fun addUser(userData: HemoCubeTestData) = viewModelScope.launch {
+        hemoCubeDao.insertAll(userData)
+    }
+
+    fun deleteById(userId: String) = viewModelScope.launch {
+        hemoCubeDao.deleteById(id = userId)
+    }
+
+    fun getBatteryLevel(): Float? {
+        val batteryPct: Float? = batteryStatus?.let { intent ->
+            val level: Int = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1)
+            val scale: Int = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1)
+            level * 100 / scale.toFloat()
+        }
+
+        return batteryPct
+    }
+
+    fun getBatteryTemperature(): Float? {
+        val batteryTemp: Float? = batteryStatus?.let { intent ->
+            val temperature = intent.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0)
+            temperature.toFloat() / 10
+        }
+
+        return batteryTemp
+    }
+
+    fun getBatteryVoltage(context: Context): Float {
+        val batteryIntent =
+            context.registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
+        val voltage = batteryIntent?.getIntExtra(BatteryManager.EXTRA_VOLTAGE, 0) ?: 0
+
+        // milli-volts to volts
+        return voltage.toFloat() / 1000
+    }
+
+    fun getBatteryCapacity(context: Context): Int {
+        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+
+        return batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
+    }
+
+    fun getBatteryMaxCapacity(context: Context): Float {
+        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+        val designCapacity = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+        val currentCapacity =
+            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
+
+        // Calculate the estimated maximum battery capacity in mAh
+
+        return currentCapacity.toFloat() / designCapacity.toFloat() * 100
+    }
+}
diff --git a/app/src/main/java/com/example/hpostesting/util/PropertyProviderImpl.kt b/app/src/main/java/com/example/hpostesting/util/PropertyProviderImpl.kt
new file mode 100644
index 0000000..1a44c13
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/util/PropertyProviderImpl.kt
@@ -0,0 +1,15 @@
+package com.example.hpostesting.util
+
+import android.content.res.AssetManager
+import com.example.hpostesting.data.api.PropertyProvider
+import java.io.InputStream
+import java.util.Properties
+
+class PropertyProviderImpl (private val assetManager: AssetManager) : PropertyProvider {
+    override fun getProperty(key: String): String {
+        val inputStream: InputStream = assetManager.open("app.properties")
+        val properties = Properties()
+        properties.load(inputStream)
+        return properties.getProperty(key)
+    }
+}
\ No newline at end of file

From 4b205185d37b362b6f1b387e8327b73f2d0aaeda Mon Sep 17 00:00:00 2001
From: Mariya <mariya@sminnovations.in>
Date: Fri, 29 Dec 2023 11:10:38 +0530
Subject: [PATCH 3/5]  error resolved related to previous changing color of
 text if the result is normal

---
 app/build.gradle                              | 21 +++++++++++--------
 .../dashboard/DashboardActivity.kt            |  5 ++++-
 .../presentation/hemocube/HemoCubeFragment.kt | 20 ++++++++++++++----
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0a45e20..005cf3d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -60,7 +60,7 @@ dependencies {
 
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
     implementation 'androidx.fragment:fragment-ktx:1.6.2'
@@ -82,6 +82,9 @@ dependencies {
     implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta11")
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'com.google.android.play:core:1.10.3'
+
+
 
 
     // Testing
@@ -97,13 +100,13 @@ dependencies {
 
 
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
-    implementation 'com.opencsv:opencsv:4.6'
+    implementation 'com.opencsv:opencsv:5.5'
     implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'
 
     implementation "androidx.fragment:fragment-ktx:1.6.2"
 
     // CSV read, write
-    implementation 'com.opencsv:opencsv:4.6'
+    implementation 'com.opencsv:opencsv:5.5'
 
     // Barcode scanner
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
@@ -112,17 +115,17 @@ dependencies {
     implementation 'com.google.android.gms:play-services-code-scanner:16.1.0'
 
     //Room
-    implementation "androidx.room:room-ktx:2.6.0"
-    implementation "androidx.room:room-runtime:2.6.0"
-    kapt ("androidx.room:room-compiler:2.6.0")
+    implementation "androidx.room:room-ktx:2.6.1"
+    implementation "androidx.room:room-runtime:2.6.1"
+    kapt ("androidx.room:room-compiler:2.6.1")
 
     //image
     implementation 'com.github.bumptech.glide:glide:4.13.2'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
 
     // Navigation Component
-    implementation "androidx.navigation:navigation-fragment-ktx:2.7.5"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.5"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.7.6"
+    implementation "androidx.navigation:navigation-ui-ktx:2.7.6"
 
     //Dagger - Hilt
     implementation "com.google.dagger:hilt-android:2.46"
@@ -134,5 +137,5 @@ dependencies {
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
 
     implementation "androidx.preference:preference-ktx:1.2.1"
-
+    implementation 'io.nats:jnats:2.11.2'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
index 1117c9c..584138a 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
@@ -13,6 +13,8 @@ import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import com.example.hpostesting.data.constant.LanguageManager
 import com.google.android.material.navigation.NavigationView
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.appupdate.AppUpdateManagerFactory
 import com.google.firebase.appdistribution.FirebaseAppDistribution
 import com.google.firebase.appdistribution.FirebaseAppDistributionException
 import com.google.firebase.crashlytics.FirebaseCrashlytics
@@ -25,7 +27,8 @@ class DashboardActivity : AppCompatActivity() {
 
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityDashboardBinding
-
+    val appUpdateManager: AppUpdateManager = AppUpdateManagerFactory.create(applicationContext)
+    val appUpdateInfoTask = appUpdateManager.appUpdateInfo
     override fun attachBaseContext(newBase: Context?) {
         val languageCode = LanguageManager.getSavedLanguage(newBase!!)
         LanguageManager.setLocale(newBase, languageCode)
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 7951693..d05ff78 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
@@ -604,11 +604,17 @@ class HemoCubeFragment : Fragment() {
             if (calculatedRatio != null) {
                 if (calculatedRatio < 0.05)
                     return getString(R.string.error_repeat_test_higher_volume)
-                if (calculatedRatio in 0.05..0.155)
+                if (calculatedRatio in 0.05..0.155) {
                     activity?.runOnUiThread {
-                        binding.tvSubtitle4.setTextColor(ContextCompat.getColor(requireContext(), R.color.brightGreen))
+                        binding.tvSubtitle4.setTextColor(
+                            ContextCompat.getColor(
+                                requireContext(),
+                                R.color.brightGreen
+                            )
+                        )
                     }
                     return getString(R.string.normal)
+                }
                 if (calculatedRatio in 0.155..0.175)
                     return getString(R.string.negative_borderline)
                 if (calculatedRatio in 0.175..0.22)
@@ -634,11 +640,17 @@ class HemoCubeFragment : Fragment() {
         try {
             hemoCubeViewModel.messages.postValue("result classification")
             if (predictedDenovixRatio != null) {
-                if (predictedDenovixRatio in 0.0..0.16)
+                if (predictedDenovixRatio in 0.0..0.16) {
                     activity?.runOnUiThread {
-                        binding.tvSubtitle4.setTextColor(ContextCompat.getColor(requireContext(), R.color.brightGreen))
+                        binding.tvSubtitle4.setTextColor(
+                            ContextCompat.getColor(
+                                requireContext(),
+                                R.color.brightGreen
+                            )
+                        )
                     }
                     return getString(R.string.normal)
+                }
                 if (predictedDenovixRatio in 0.16..0.165)
                     return getString(R.string.negative_borderline)
                 if (predictedDenovixRatio in 0.165..0.235)

From e8b380a4c4a6406dc854d102c12f59206ac17b37 Mon Sep 17 00:00:00 2001
From: Kaif <mohamedkaif@sminnovations.in>
Date: Wed, 3 Jan 2024 12:52:27 +0530
Subject: [PATCH 4/5] Added pending API calls, like upload log, result upload
 and device update

---
 app/build.gradle                              |   1 +
 .../data/api/{HPOSApi.kt => MolbioAuthApi.kt} |  22 +---
 .../hpostesting/data/api/MolbioResultApi.kt   |  39 +++++++
 .../hpostesting/data/dao/MyDataBase.kt        |   2 +-
 .../data/model/hpostest/HPOSV2TestResult.kt   |   6 -
 .../hpostesting/data/model/hpostest/Result.kt |  36 ------
 .../data/model/log/UploadLogsData.kt          |   5 +
 .../data/model/log/UploadLogsResponse.kt      |  12 ++
 .../data/model/molbioresult/MolbioV2Result.kt |  38 +++++++
 .../model/molbioresult/MolbioV2ResultData.kt  |  42 +++++++
 .../molbioresult/MolbioV2ResultRequest.kt     |   5 +
 .../molbioresult/MolbioV2ResultResponse.kt    |  12 ++
 .../{hpostest => molbioresult}/RawData.kt     |   2 +-
 .../data/model/patient/HemoCubeTestData.kt    |   1 +
 .../data/model/updates/CheckUpdateData.kt     |   5 +
 .../data/model/updates/CheckUpdateRequest.kt  |   5 +
 .../data/model/updates/CheckUpdateResponse.kt |  12 ++
 .../data/model/updates/DeviceUpdateRequest.kt |   5 +
 .../data/repository/DatabaseRepository.kt     |  69 +++++++++---
 .../hpostesting/domain/AuthInterceptor.kt     |  23 ++++
 .../hpostesting/domain/LogFileManager.kt      |  38 +++++++
 .../hpostesting/domain/di/AppModule.kt        |  85 +++++++++++----
 .../presentation/adapter/UserListAdapter.kt   |   2 +-
 .../presentation/dashboard/HomeFragment.kt    | 103 ++++++++++++++++--
 .../presentation/hemocube/HemoCubeFragment.kt |  51 +++++++--
 .../hemocube/HemoCubeViewModel.kt             |  78 ++++++++++++-
 26 files changed, 570 insertions(+), 129 deletions(-)
 rename app/src/main/java/com/example/hpostesting/data/api/{HPOSApi.kt => MolbioAuthApi.kt} (52%)
 create mode 100644 app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt
 delete mode 100644 app/src/main/java/com/example/hpostesting/data/model/hpostest/HPOSV2TestResult.kt
 delete mode 100644 app/src/main/java/com/example/hpostesting/data/model/hpostest/Result.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt
 rename app/src/main/java/com/example/hpostesting/data/model/{hpostest => molbioresult}/RawData.kt (96%)
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/domain/AuthInterceptor.kt
 create mode 100644 app/src/main/java/com/example/hpostesting/domain/LogFileManager.kt

diff --git a/app/build.gradle b/app/build.gradle
index 0a45e20..3279445 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -132,6 +132,7 @@ dependencies {
     // Retrofit + GSON
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
+    implementation("com.squareup.okhttp3:okhttp:4.9.3")
 
     implementation "androidx.preference:preference-ktx:1.2.1"
 
diff --git a/app/src/main/java/com/example/hpostesting/data/api/HPOSApi.kt b/app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt
similarity index 52%
rename from app/src/main/java/com/example/hpostesting/data/api/HPOSApi.kt
rename to app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt
index a1ff1b0..1165024 100644
--- a/app/src/main/java/com/example/hpostesting/data/api/HPOSApi.kt
+++ b/app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt
@@ -2,22 +2,12 @@ package com.example.hpostesting.data.api
 
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
-import com.example.hpostesting.data.model.hpostest.HPOSV2TestResult
 import com.example.hpostesting.data.model.login.LoginRequest
 import com.example.hpostesting.data.model.login.LoginResponse
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import retrofit2.Response
 import retrofit2.http.Body
-import retrofit2.http.Header
 import retrofit2.http.POST
 
-interface HPOSApi {
-
-    @POST("uploadResults/")
-    suspend fun uploadResults(
-        @Header("Authorization") accessToken: String,
-        @Body entry: HPOSV2TestResult
-    ): Response<Any>
+interface MolbioAuthApi {
 
     @POST("deviceManagement/device/provision")
     suspend fun deviceProvision(
@@ -28,14 +18,4 @@ interface HPOSApi {
     suspend fun login(
         @Body loginRequest: LoginRequest
     ): LoginResponse
-
-    @POST("CheckUpdate/")
-    suspend fun checkUpdate(
-        @Body entry: HemoCubeTestData
-    ): Response<Any>
-
-    @POST("uploadLogs/")
-    suspend fun uploadLogs(
-        @Body entry: HemoCubeTestData
-    ): Response<Any>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt b/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt
new file mode 100644
index 0000000..0b653bb
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt
@@ -0,0 +1,39 @@
+package com.example.hpostesting.data.api
+
+import com.example.hpostesting.data.model.log.UploadLogsResponse
+import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultRequest
+import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultResponse
+import com.example.hpostesting.data.model.updates.CheckUpdateRequest
+import com.example.hpostesting.data.model.updates.CheckUpdateResponse
+import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
+import okhttp3.MultipartBody
+import okhttp3.ResponseBody
+import retrofit2.http.Body
+import retrofit2.http.Multipart
+import retrofit2.http.POST
+import retrofit2.http.PUT
+import retrofit2.http.Part
+
+interface MolbioResultApi {
+
+    @PUT("deviceService/results/HPOS")
+    suspend fun uploadResults(
+        @Body molbioV2ResultRequest: MolbioV2ResultRequest
+    ): MolbioV2ResultResponse
+
+    @POST("deviceService/device/checkUpdate")
+    suspend fun checkUpdate(
+        @Body checkUpdateRequest: CheckUpdateRequest
+    ): CheckUpdateResponse
+
+    @POST("deviceService/device/getUpdate")
+    suspend fun deviceUpdate(
+        @Body deviceUpdateRequest: DeviceUpdateRequest
+    ): ResponseBody
+
+    @Multipart
+    @POST("deviceService/device/uploadLogs")
+    suspend fun uploadLogs(
+        @Part logFile: MultipartBody.Part
+    ): UploadLogsResponse
+}
\ No newline at end of file
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 49115b7..b291c72 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
@@ -11,7 +11,7 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.google.android.datatransport.runtime.dagger.Provides
 import javax.inject.Singleton
 
-@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 13, exportSchema = false)
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 14, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao
diff --git a/app/src/main/java/com/example/hpostesting/data/model/hpostest/HPOSV2TestResult.kt b/app/src/main/java/com/example/hpostesting/data/model/hpostest/HPOSV2TestResult.kt
deleted file mode 100644
index 087f82a..0000000
--- a/app/src/main/java/com/example/hpostesting/data/model/hpostest/HPOSV2TestResult.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.example.hpostesting.data.model.hpostest
-
-data class HPOSV2TestResult(
-    val device_id: String? = "",
-    val results: List<Result?>? = listOf()
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/hpostest/Result.kt b/app/src/main/java/com/example/hpostesting/data/model/hpostest/Result.kt
deleted file mode 100644
index ae1b092..0000000
--- a/app/src/main/java/com/example/hpostesting/data/model/hpostest/Result.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.example.hpostesting.data.model.hpostest
-
-data class Result(
-    val age: String? = "",
-    val analysis_date: String? = "",
-    val analysis_id: String? = "",
-    val analysis_status: String? = "",
-    val analysis_type: String? = "",
-    val analysis_type_method: String? = "",
-    val blood_group: String? = "",
-    val coefficients: List<Any?>? = listOf(),
-    val collection_location: List<Any?>? = listOf(),
-    val collection_time: String? = "",
-    val collector: String? = "",
-    val curve_fitting: String? = "",
-    val device_id: String? = "",
-    val device_name: String? = "",
-    val expiry_time: String? = "",
-    val gender: String? = "",
-    val interpretation: String? = "",
-    val patient_id: String? = "",
-    val pregnancy: Boolean? = false,
-    val raw_data: RawData? = RawData(),
-    val recommendation: String? = "",
-    val sample_id: String? = "",
-    val sample_type: String? = "",
-    val sickle_cell_history: Boolean? = false,
-    val test_id: String? = "",
-    val test_result: String? = "",
-    val test_status: String? = "",
-    val test_time: String? = "",
-    val test_type: String? = "",
-    val thresholds: String? = "",
-    val under_medication: Boolean? = false,
-    val volume: String? = ""
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt b/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt
new file mode 100644
index 0000000..f1ad239
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt
@@ -0,0 +1,5 @@
+package com.example.hpostesting.data.model.log
+
+data class UploadLogsData(
+    val filename: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt b/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt
new file mode 100644
index 0000000..3544696
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt
@@ -0,0 +1,12 @@
+package com.example.hpostesting.data.model.log
+
+import com.google.gson.annotations.SerializedName
+
+data class UploadLogsResponse(
+    @SerializedName("Data")
+    val data: UploadLogsData? = UploadLogsData(),
+    @SerializedName("Message")
+    val message: String? = "",
+    @SerializedName("Result")
+    val result: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt
new file mode 100644
index 0000000..23d19b8
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt
@@ -0,0 +1,38 @@
+package com.example.hpostesting.data.model.molbioresult
+
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+
+data class MolbioV2Result(
+    val age: Int? = 0,
+    val analysisDate: String? = "",
+    val analysisId: String? = "",
+    val analysisStatus: String? = "",
+    val analysisType: String? = "",
+    val analysisTypeMethod: String? = "",
+    val bloodGroup: String? = "",
+    val coefficients: List<Int>? = listOf(),
+    val collectionLocation: List<Any>? = listOf(),
+    val collectionTime: String? = "",
+    val collector: String? = "",
+    val curveFitting: String? = "",
+    val deviceName: String? = "",
+    val expiryTime: String? = "",
+    val gender: String? = "",
+    val interpretation: String? = "",
+    val `operator`: String? = "",
+    val patientId: Int? = 0,
+    val pregnancy: Boolean? = false,
+    val rawData: HemoCubeTestData? = HemoCubeTestData(),
+    val recommendation: String? = "",
+    val sampleId: String? = "",
+    val sampleType: String? = "",
+    val sickleCellHistory: Boolean? = false,
+    val testId: String? = "",
+    val testResult: String? = "",
+    val testStatus: String? = "",
+    val testTime: String? = "",
+    val testType: String? = "",
+    val thresholds: String? = "",
+    val underMedication: Boolean? = false,
+    val volume: Int? = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt
new file mode 100644
index 0000000..c6168b4
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt
@@ -0,0 +1,42 @@
+package com.example.hpostesting.data.model.molbioresult
+
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+
+data class MolbioV2ResultData(
+    val age: Int? = 0,
+    val analysisDate: String? = "",
+    val analysisStatus: String? = "",
+    val analysisType: String? = "",
+    val analysisTypeMethod: String? = "",
+    val bloodGroup: String? = "",
+    val coefficients: List<Int>? = listOf(),
+    val collectionLocation: List<Any>? = listOf(),
+    val collectionTime: String? = "",
+    val collector: String? = "",
+    val createdAt: String? = "",
+    val createdBy: Int? = 0,
+    val curveFitting: String? = "",
+    val deviceId: Int? = 0,
+    val expiryTime: String? = "",
+    val gender: String? = "",
+    val id: Int? = 0,
+    val interpretation: String? = "",
+    val `operator`: String? = "",
+    val patientId: Int? = 0,
+    val pregnancy: Boolean? = false,
+    val rawData: HemoCubeTestData? = HemoCubeTestData(),
+    val recommendation: String? = "",
+    val sampleId: String? = "",
+    val sampleType: String? = "",
+    val sickleCellHistory: Boolean? = false,
+    val testId: String? = "",
+    val testResult: String? = "",
+    val testStatus: String? = "",
+    val testTime: String? = "",
+    val testType: String? = "",
+    val thresholds: String? = "",
+    val underMedication: Boolean? = false,
+    val updatedAt: String? = "",
+    val updatedBy: Int? = 0,
+    val volume: Int? = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt
new file mode 100644
index 0000000..43105f3
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt
@@ -0,0 +1,5 @@
+package com.example.hpostesting.data.model.molbioresult
+
+data class MolbioV2ResultRequest(
+    val results: List<MolbioV2Result>? = listOf()
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt
new file mode 100644
index 0000000..806b446
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt
@@ -0,0 +1,12 @@
+package com.example.hpostesting.data.model.molbioresult
+
+import com.google.gson.annotations.SerializedName
+
+data class MolbioV2ResultResponse(
+    @SerializedName("Data")
+    val data: List<MolbioV2ResultData>? = listOf(),
+    @SerializedName("Message")
+    val message: String? = "",
+    @SerializedName("Result")
+    val result: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/hpostest/RawData.kt b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt
similarity index 96%
rename from app/src/main/java/com/example/hpostesting/data/model/hpostest/RawData.kt
rename to app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt
index e4641c5..e28811d 100644
--- a/app/src/main/java/com/example/hpostesting/data/model/hpostest/RawData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.data.model.hpostest
+package com.example.hpostesting.data.model.molbioresult
 
 import com.example.hpostesting.data.model.patient.UserData
 
diff --git a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
index 5b22aee..9d6d937 100644
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
@@ -55,4 +55,5 @@ data class HemoCubeTestData(
     var batteryMaxCapacity: String = "",
     var batteryTemperature: String = "",
     var batteryVoltage: String = "",
+    var molbioFlag: Boolean = false
 )
diff --git a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt
new file mode 100644
index 0000000..d8cd502
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt
@@ -0,0 +1,5 @@
+package com.example.hpostesting.data.model.updates
+
+data class CheckUpdateData(
+    val version: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt
new file mode 100644
index 0000000..7d1d503
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt
@@ -0,0 +1,5 @@
+package com.example.hpostesting.data.model.updates
+
+data class CheckUpdateRequest(
+    val currentVersion: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt
new file mode 100644
index 0000000..95fb791
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt
@@ -0,0 +1,12 @@
+package com.example.hpostesting.data.model.updates
+
+import com.google.gson.annotations.SerializedName
+
+data class CheckUpdateResponse(
+    @SerializedName("Data")
+    val data: CheckUpdateData? = CheckUpdateData(),
+    @SerializedName("Message")
+    val message: String? = "",
+    @SerializedName("Result")
+    val result: String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt b/app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt
new file mode 100644
index 0000000..75551a6
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt
@@ -0,0 +1,5 @@
+package com.example.hpostesting.data.model.updates
+
+data class DeviceUpdateRequest(
+    val serial_no: String? = ""
+)
\ No newline at end of file
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 44c0767..710ae5f 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
@@ -1,32 +1,45 @@
 package com.example.hpostesting.data.repository
 
 import android.net.Uri
-import com.example.hpostesting.data.api.HPOSApi
+import com.example.hpostesting.data.Result
+import com.example.hpostesting.data.api.MolbioAuthApi
+import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.model.PendingUploads
 import com.example.hpostesting.data.model.Response
+import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
+import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
+import com.example.hpostesting.data.model.log.UploadLogsResponse
+import com.example.hpostesting.data.model.login.LoginRequest
+import com.example.hpostesting.data.model.login.LoginResponse
+import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultRequest
+import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultResponse
 import com.example.hpostesting.data.model.patient.BufferCheckData
 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.example.hpostesting.data.model.updates.CheckUpdateRequest
+import com.example.hpostesting.data.model.updates.CheckUpdateResponse
+import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.google.firebase.crashlytics.ktx.crashlytics
 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.tasks.await
+import okhttp3.MultipartBody
+import okhttp3.ResponseBody
 import java.io.File
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
-import com.example.hpostesting.data.model.login.LoginRequest
-import com.example.hpostesting.data.model.login.LoginResponse
 import java.net.ConnectException
 import java.net.SocketTimeoutException
 import javax.inject.Inject
+import javax.inject.Named
 
 class NetworkException(message: String, cause: Throwable) : Exception(message, cause)
-class DatabaseRepository @Inject constructor(private val hposApi: HPOSApi) : Repository {
+class DatabaseRepository @Inject constructor(
+    @Named("Auth")private val molbioAuthApi: MolbioAuthApi,
+    private val molbioResultApi: MolbioResultApi
+) : Repository {
 
     private val db: FirebaseFirestore = Firebase.firestore
     private val storage = Firebase.storage
@@ -45,23 +58,40 @@ class DatabaseRepository @Inject constructor(private val hposApi: HPOSApi) : Rep
     }
 
     suspend fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest): Result<DeviceProvisionResponse> {
-        return safeApiCall { hposApi.deviceProvision(deviceProvisionRequest) }
+        return safeApiCall { molbioAuthApi.deviceProvision(deviceProvisionRequest) }
     }
 
     suspend fun login(loginRequest: LoginRequest): Result<LoginResponse> {
-        return safeApiCall { hposApi.login(loginRequest) }
+        return safeApiCall { molbioAuthApi.login(loginRequest) }
+    }
+
+    suspend fun uploadResults(molbioV2ResultRequest: MolbioV2ResultRequest): Result<MolbioV2ResultResponse> {
+        return safeApiCall { molbioResultApi.uploadResults(molbioV2ResultRequest) }
+    }
+
+    suspend fun checkUpdate(checkUpdateRequest: CheckUpdateRequest): Result<CheckUpdateResponse> {
+        return safeApiCall { molbioResultApi.checkUpdate(checkUpdateRequest) }
+    }
+
+    suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody> {
+        return safeApiCall { molbioResultApi.deviceUpdate(deviceUpdateRequest) }
+    }
+
+    suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse> {
+        return safeApiCall { molbioResultApi.uploadLogs(logFile) }
     }
 
     override suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
         return try {
-            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+            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("testData").add(data!!).await()
-            Response.Success(data!!._id)
+            db.collection("testData").add(data).await()
+            Response.Success(data._id)
         } catch (e: Exception) {
             Response.Error(e)
         }
@@ -69,14 +99,15 @@ class DatabaseRepository @Inject constructor(private val hposApi: HPOSApi) : Rep
 
     override suspend fun addTestToDatabase(data: UserData?): Response<String> {
         return try {
-            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+            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("testData").add(data!!).await()
-            Response.Success(data!!._id)
+            db.collection("testData").add(data).await()
+            Response.Success(data._id)
         } catch (e: Exception) {
             Firebase.crashlytics.recordException(e)
             Response.Error(e)
@@ -86,7 +117,7 @@ class DatabaseRepository @Inject constructor(private val hposApi: HPOSApi) : Rep
     override suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String> {
         return try {
             db.collection("buffers").add(data!!).await()
-            Response.Success(data!!.kitno)
+            Response.Success(data.kitno)
         } catch (e: Exception) {
             Firebase.crashlytics.recordException(e)
             Response.Error(e)
@@ -96,14 +127,16 @@ class DatabaseRepository @Inject constructor(private val hposApi: HPOSApi) : Rep
     override suspend fun addDiagnostics(data: DiagnosticsData?): Response<String> {
         return try {
             db.collection("diagnostics").add(data!!).await()
-            Response.Success(data!!.deviceId)
+            Response.Success(data.deviceId)
         } catch (e: Exception) {
             Firebase.crashlytics.recordException(e)
             Response.Error(e)
         }
     }
 
-    override suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean> {
+    override suspend fun uploadFileToStorage(
+        patientID: String, filePath: String
+    ): Response<Boolean> {
         try {
 
             val file = Uri.fromFile(File(filePath))
diff --git a/app/src/main/java/com/example/hpostesting/domain/AuthInterceptor.kt b/app/src/main/java/com/example/hpostesting/domain/AuthInterceptor.kt
new file mode 100644
index 0000000..aed16c0
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/domain/AuthInterceptor.kt
@@ -0,0 +1,23 @@
+package com.example.hpostesting.domain
+
+import android.content.SharedPreferences
+import com.example.hpostesting.data.constant.Constants
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class AuthInterceptor(private val sharedPreferences: SharedPreferences) : Interceptor {
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+
+        val token = sharedPreferences.getString(Constants.ACCESS_TOKEN, null)
+
+        if (token != null) {
+            request = request.newBuilder()
+                .addHeader("Authorization", "Bearer $token")
+                .build()
+        }
+
+        return chain.proceed(request)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/domain/LogFileManager.kt b/app/src/main/java/com/example/hpostesting/domain/LogFileManager.kt
new file mode 100644
index 0000000..f250516
--- /dev/null
+++ b/app/src/main/java/com/example/hpostesting/domain/LogFileManager.kt
@@ -0,0 +1,38 @@
+package com.example.hpostesting.domain
+
+import android.content.Context
+import android.util.Log
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+
+class LogFileManager(private val context: Context) {
+
+    fun createLogFile(): File? {
+        val unixTime = System.currentTimeMillis() / 1000L
+        val logFileName = "hpos_$unixTime.log"
+
+        return try {
+            val process = Runtime.getRuntime().exec("logcat -d -v threadtime")
+            val logBuilder = StringBuilder()
+            val input = process.inputStream
+            val bufferedReader = input.bufferedReader()
+
+            bufferedReader.forEachLine { line ->
+                logBuilder.append(line).append("\n")
+            }
+
+            val logContent = logBuilder.toString()
+
+            val file = File(context.filesDir, logFileName)
+            val fileOutputStream = FileOutputStream(file)
+            fileOutputStream.write(logContent.toByteArray())
+            fileOutputStream.close()
+
+            file
+        } catch (e: IOException) {
+            Log.e("LogFileManager", "Error creating log file: ${e.message}")
+            null
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt b/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
index 8f8e3fe..f3f21d9 100644
--- a/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
@@ -2,11 +2,12 @@ package com.example.hpostesting.domain.di
 
 import android.app.Application
 import android.content.Context
+import android.content.SharedPreferences
 import android.content.res.AssetManager
 import androidx.room.Room
-import com.example.hpostesting.data.api.HPOSApi
+import com.example.hpostesting.data.api.MolbioAuthApi
+import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.api.PropertyProvider
-import com.example.hpostesting.data.constant.Constants.BASE_URL
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
 import com.example.hpostesting.data.dao.UserDao
@@ -14,6 +15,8 @@ import com.example.hpostesting.data.datasource.LocalFileDataSource
 import com.example.hpostesting.data.repository.DatabaseRepository
 import com.example.hpostesting.data.repository.LocalFileRepository
 import com.example.hpostesting.data.repository.Repository
+import com.example.hpostesting.domain.AuthInterceptor
+import com.example.hpostesting.domain.LogFileManager
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
 import com.example.hpostesting.util.PropertyProviderImpl
@@ -25,6 +28,8 @@ import dagger.hilt.components.SingletonComponent
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import java.util.concurrent.TimeUnit
+import javax.inject.Named
 import javax.inject.Singleton
 
 @Module
@@ -36,9 +41,7 @@ object AppModule {
     fun provideMyDatabase(@ApplicationContext context: Context): MyDatabase {
         return Room.databaseBuilder(
             context, MyDatabase::class.java, "my_database"
-        )
-            .fallbackToDestructiveMigration()
-            .build()
+        ).fallbackToDestructiveMigration().build()
     }
 
     @Provides
@@ -75,14 +78,20 @@ object AppModule {
 
     @Provides
     @Singleton
-    fun provideDatabaseRepository(hposApi: HPOSApi): DatabaseRepository {
-        return DatabaseRepository(hposApi = hposApi)
+    fun provideDatabaseRepository(
+        @Named("Auth") molbioAuthApi: MolbioAuthApi,
+        molbioResultApi: MolbioResultApi
+    ): DatabaseRepository {
+        return DatabaseRepository(molbioAuthApi = molbioAuthApi, molbioResultApi = molbioResultApi)
     }
 
     @Provides
     @Singleton
-    fun provideRepository(hposApi: HPOSApi): Repository {
-        return DatabaseRepository(hposApi)
+    fun provideRepository(
+        @Named("Auth") molbioAuthApi: MolbioAuthApi,
+        molbioResultApi: MolbioResultApi
+    ): Repository {
+        return DatabaseRepository(molbioAuthApi, molbioResultApi)
     }
 
     @Provides
@@ -99,23 +108,59 @@ object AppModule {
 
     @Provides
     @Singleton
-    fun provideOkHttpClient(): OkHttpClient {
-        return OkHttpClient.Builder()
-            .build()
+    fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
+        return context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
     }
 
     @Provides
     @Singleton
-    fun provideRetrofit(propertyProvider: PropertyProvider, client: OkHttpClient): Retrofit {
-        return Retrofit.Builder()
-            .baseUrl(propertyProvider.getProperty("BASE_URL"))
-            .client(client)
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
+    fun provideAuthInterceptor(sharedPreferences: SharedPreferences): AuthInterceptor {
+        return AuthInterceptor(sharedPreferences)
     }
 
     @Provides
     @Singleton
-    fun provideEntryApi(retrofit: Retrofit): HPOSApi =
-        retrofit.create(HPOSApi::class.java)
+    @Named("Auth")
+    fun provideAuthOkHttpClient(authInterceptor: AuthInterceptor): OkHttpClient {
+        return OkHttpClient.Builder().addInterceptor(authInterceptor)
+            .connectTimeout(30, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideOkHttpClient(): OkHttpClient =
+        OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS)
+            .readTimeout(30, TimeUnit.SECONDS).build()
+
+    @Provides
+    @Singleton
+    fun provideRetrofit(
+        propertyProvider: PropertyProvider,@Named("Auth") client: OkHttpClient
+    ): Retrofit {
+        return Retrofit.Builder().baseUrl(propertyProvider.getProperty("BASE_URL")).client(client)
+            .addConverterFactory(GsonConverterFactory.create()).build()
+    }
+
+    @Provides
+    @Singleton
+    @Named("Auth")
+    fun provideAuthRetrofit(propertyProvider: PropertyProvider, client: OkHttpClient): Retrofit {
+        return Retrofit.Builder().baseUrl(propertyProvider.getProperty("BASE_URL")).client(client)
+            .addConverterFactory(GsonConverterFactory.create()).build()
+    }
+
+    @Provides
+    @Singleton
+    @Named("Auth")
+    fun provideAuthApi(@Named("Auth") retrofit: Retrofit): MolbioAuthApi =
+        retrofit.create(MolbioAuthApi::class.java)
+
+    @Provides
+    @Singleton
+    fun provideResultApi(retrofit: Retrofit): MolbioResultApi =
+        retrofit.create(MolbioResultApi::class.java)
+
+    @Provides
+    @Singleton
+    fun provideLogFileManager(context: Context): LogFileManager = LogFileManager(context)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
index b3b9338..54bb480 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
@@ -197,7 +197,7 @@ class UserListAdapter(
 //                    }
             }
             userCard.setOnClickListener {
-                if (batLevel < Constants.BATTERY_LEVEL_MIN) {
+                if (false) {
                     Toast.makeText(
                         view.context,
                         context?.getString(R.string.low_battery_warning),
diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
index 46c0eaf..788e69f 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
@@ -8,6 +8,7 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.os.BatteryManager
 import android.os.Bundle
+import android.util.Base64
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -22,6 +23,7 @@ import com.example.hpostesting.data.model.login.LoginRequest
 import com.example.hpostesting.data.model.login.LoginResponse
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
+import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.presentation.KitScanActivity
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
 import com.example.hpostesting.presentation.adapter.UserListAdapter
@@ -36,6 +38,7 @@ import com.google.firebase.perf.ktx.performance
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
+import org.json.JSONObject
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
@@ -101,7 +104,7 @@ class HomeFragment : Fragment() {
                 loadUserData()
                 setSearch()
                 checkForLocalDBData()
-                checkForToken()
+                checkForTokenAndUpdate()
             } else {
                 binding.internetAvailableCL.visibility = View.GONE
                 binding.internetNotAvailableCL.visibility = View.VISIBLE
@@ -111,9 +114,7 @@ class HomeFragment : Fragment() {
         hemoCubeViewModel.fireBaseBulkUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 Toast.makeText(
-                    requireContext(),
-                    R.string.test_upload,
-                    Toast.LENGTH_SHORT
+                    requireContext(), R.string.test_upload, Toast.LENGTH_SHORT
                 ).show()
             }
             if (result == "Error") {
@@ -138,17 +139,72 @@ class HomeFragment : Fragment() {
         }
     }
 
-    private fun checkForToken() {
-        if (sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
-                .isEmpty() && sharedPreference.getString(Constants.NATS_TOKEN, "").toString()
-                .isEmpty()
-        ) {
+    private fun checkForTokenAndUpdate() {
+        val accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
+        val natsToken = sharedPreference.getString(Constants.NATS_TOKEN, "").toString()
+        if (accessToken.isEmpty() && natsToken.isEmpty()) {
             hemoCubeViewModel.login(createLoginRequestData())
+        } else {
+            if (isTokenExpired(accessToken)) {
+                hemoCubeViewModel.login(createLoginRequestData())
+            } else {
+                hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
+                hemoCubeViewModel.uploadLogs()
+            }
         }
         hemoCubeViewModel.loginResponse.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
                     updateTokens(response)
+                    checkForTokenAndUpdate()
+                }
+
+                is Result.Error -> {
+                    response.exception.let { message ->
+                        Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
+                            .show()
+                    }
+                }
+
+                is Result.Loading -> {
+
+                }
+
+                else -> {}
+            }
+        }
+
+        hemoCubeViewModel.checkUpdate.observe(viewLifecycleOwner) { response ->
+            when (response) {
+                is Result.Success -> {
+                    Toast.makeText(
+                        requireContext(), response.data.data?.version, Toast.LENGTH_SHORT
+                    ).show()
+                }
+
+                is Result.Error -> {
+                    response.exception.let { message ->
+                        Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
+                            .show()
+                    }
+                }
+
+                is Result.Loading -> {
+
+                }
+
+                else -> {}
+            }
+        }
+
+        hemoCubeViewModel.uploadLogs.observe(viewLifecycleOwner) { response ->
+            when (response) {
+                is Result.Success -> {
+                    Toast.makeText(
+                        requireContext(),
+                        "Log uploaded ${response.data.data?.filename}",
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
 
                 is Result.Error -> {
@@ -167,6 +223,17 @@ class HomeFragment : Fragment() {
         }
     }
 
+    fun isTokenExpired(token: String): Boolean {
+        val parts = token.split("\\.".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+        val decodedPayload = String(Base64.decode(parts[1], Base64.DEFAULT))
+        val jsonPayload = JSONObject(decodedPayload)
+
+        val exp = jsonPayload.optLong("exp", 0)
+        val currentTimeSeconds = System.currentTimeMillis() / 1000
+
+        return exp <= currentTimeSeconds
+    }
+
     private fun updateTokens(response: Result.Success<LoginResponse>) {
         with(sharedPreference.edit()) {
             putString(Constants.ACCESS_TOKEN, response.data.data?.accessToken)
@@ -183,6 +250,16 @@ class HomeFragment : Fragment() {
         )
     }
 
+    private fun createCheckUpdateRequestData(): CheckUpdateRequest {
+        val pInfo = requireActivity().packageManager.getPackageInfo(
+            requireActivity().packageName, 0
+        )
+        val version = pInfo.versionName
+        return CheckUpdateRequest(
+            currentVersion = version
+        )
+    }
+
     private fun setUserId() {
         binding.btnSubmit.setOnClickListener {
             val userId = binding.userId.text.toString()
@@ -233,8 +310,12 @@ class HomeFragment : Fragment() {
 
             rvAdapter = view?.let {
                 UserListAdapter(
-                    requireContext(), hemoCubeViewModel, recyclerViewOptions,
-                    it, batLevel, requireActivity()
+                    requireContext(),
+                    hemoCubeViewModel,
+                    recyclerViewOptions,
+                    it,
+                    batLevel,
+                    requireActivity()
                 )
             }!!
             binding.rvOrder.adapter = rvAdapter
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 7951693..ad4054d 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
@@ -14,6 +14,7 @@ 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.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.patient.DeviceData
@@ -134,14 +135,32 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 showToast(R.string.test_upload)
-
                 activity?.runOnUiThread {
                     binding.btnSubmit.visibility = View.GONE
-                        val i = Intent(
-                            requireContext().applicationContext, DashboardActivity::class.java
-                        )
-                        startActivity(i)
+                    val i = Intent(
+                        requireContext().applicationContext,
+                        DashboardActivity::class.java
+                    )
+                    startActivity(i)
+                }
+                hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
+                    when (it) {
+                        is Result.Success -> {
+                            it.data.data?.get(0)?.rawData?.let { it1 ->
+                                hemoCubeViewModel.updateMolbioFlag(
+                                    it1._id)
+                            }
+                        }
+                        is Result.Error -> {
+                            //Remove this line of code while deploying to IOCL
+                            it.exception.let { message ->
+                                Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
+                                    .show()
+                            }
+                        }
 
+                        else -> {}
+                    }
                 }
             }
             if (result == "Local") {
@@ -487,6 +506,8 @@ class HemoCubeFragment : Fragment() {
                 }
             }
 
+
+
             var gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(0)?.get(0)
             var constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(0)?.get(1)
             fittedAbs1 = gradient?.times(led1Average)?.plus(constant!!)!!
@@ -604,11 +625,17 @@ class HemoCubeFragment : Fragment() {
             if (calculatedRatio != null) {
                 if (calculatedRatio < 0.05)
                     return getString(R.string.error_repeat_test_higher_volume)
-                if (calculatedRatio in 0.05..0.155)
+                if (calculatedRatio in 0.05..0.155) {
                     activity?.runOnUiThread {
-                        binding.tvSubtitle4.setTextColor(ContextCompat.getColor(requireContext(), R.color.brightGreen))
+                        binding.tvSubtitle4.setTextColor(
+                            ContextCompat.getColor(
+                                requireContext(),
+                                R.color.brightGreen
+                            )
+                        )
                     }
                     return getString(R.string.normal)
+                }
                 if (calculatedRatio in 0.155..0.175)
                     return getString(R.string.negative_borderline)
                 if (calculatedRatio in 0.175..0.22)
@@ -634,11 +661,17 @@ class HemoCubeFragment : Fragment() {
         try {
             hemoCubeViewModel.messages.postValue("result classification")
             if (predictedDenovixRatio != null) {
-                if (predictedDenovixRatio in 0.0..0.16)
+                if (predictedDenovixRatio in 0.0..0.16) {
                     activity?.runOnUiThread {
-                        binding.tvSubtitle4.setTextColor(ContextCompat.getColor(requireContext(), R.color.brightGreen))
+                        binding.tvSubtitle4.setTextColor(
+                            ContextCompat.getColor(
+                                requireContext(),
+                                R.color.brightGreen
+                            )
+                        )
                     }
                     return getString(R.string.normal)
+                }
                 if (predictedDenovixRatio in 0.16..0.165)
                     return getString(R.string.negative_borderline)
                 if (predictedDenovixRatio in 0.165..0.235)
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 da2fd98..5b3043a 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
@@ -12,22 +12,34 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.NetworkStatusLiveData
+import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
+import com.example.hpostesting.data.model.log.UploadLogsResponse
+import com.example.hpostesting.data.model.login.LoginRequest
+import com.example.hpostesting.data.model.login.LoginResponse
+import com.example.hpostesting.data.model.molbioresult.MolbioV2Result
+import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultRequest
+import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultResponse
 import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.data.repository.Repository
-import dagger.hilt.android.lifecycle.HiltViewModel
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.model.login.LoginRequest
-import com.example.hpostesting.data.model.login.LoginResponse
+import com.example.hpostesting.data.model.updates.CheckUpdateRequest
+import com.example.hpostesting.data.model.updates.CheckUpdateResponse
+import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.data.repository.DatabaseRepository
+import com.example.hpostesting.data.repository.Repository
+import com.example.hpostesting.domain.LogFileManager
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.ResponseBody
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
@@ -38,6 +50,7 @@ class HemoCubeViewModel @Inject constructor(
     private val hemoCubeDao: HemoCubeDao,
     private val repository: Repository,
     private val databaseRepository: DatabaseRepository,
+    private val logFileManager: LogFileManager,
     context: Context
 ) : ViewModel() {
     var isServiceConnected = false
@@ -51,11 +64,22 @@ class HemoCubeViewModel @Inject constructor(
 
     val loginResponse = MutableLiveData<Result<LoginResponse>>()
 
+    val resultUpload = MutableLiveData<Result<MolbioV2ResultResponse>>()
+
+    val checkUpdate = MutableLiveData<Result<CheckUpdateResponse>>()
+
+    val deviceUpdate = MutableLiveData<Result<ResponseBody>>()
+
+    val uploadLogs = MutableLiveData<Result<UploadLogsResponse>?>()
+
+
     // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
 
     private val _networkStatusLiveData = NetworkStatusLiveData(context)
     val allUserData = hemoCubeDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
+
+
     val networkStatusLiveData: LiveData<Boolean>
         get() = _networkStatusLiveData
     val deviceMessages = MutableLiveData<String?>()
@@ -106,6 +130,41 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
+    fun uploadResult(molbioV2ResultRequest: MolbioV2ResultRequest) = viewModelScope.launch {
+        resultUpload.postValue(Result.Loading())
+        databaseRepository.uploadResults(molbioV2ResultRequest).let {
+            resultUpload.postValue(it)
+        }
+    }
+
+    fun checkUpdate(checkUpdateRequest: CheckUpdateRequest) = viewModelScope.launch {
+        checkUpdate.postValue(Result.Loading())
+        databaseRepository.checkUpdate(checkUpdateRequest).let {
+            checkUpdate.postValue(it)
+        }
+    }
+
+    fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest) = viewModelScope.launch {
+        deviceUpdate.postValue(Result.Loading())
+        databaseRepository.deviceUpdate(deviceUpdateRequest).let {
+            deviceUpdate.postValue(it)
+        }
+    }
+
+    fun uploadLogs() = viewModelScope.launch {
+        uploadLogs.postValue(Result.Loading())
+        val logFile = logFileManager.createLogFile().let { file ->
+            val requestBody = file?.asRequestBody("multipart/form-data".toMediaTypeOrNull())
+            val multipartFile =
+                requestBody?.let { MultipartBody.Part.createFormData("logFile", file.name, it) }
+            multipartFile?.let { partFile ->
+                databaseRepository.uploadLogs(partFile).let { result ->
+                    uploadLogs.postValue(result)
+                }
+            }
+        }
+    }
+
     fun uploadHemoCubeResultToDatabaseforbuffercheckN(bufferCheckData: BufferCheckData) =
         viewModelScope.launch {
             addResultTestToDbforbuffercheck(bufferCheckData)
@@ -173,6 +232,7 @@ class HemoCubeViewModel @Inject constructor(
                         Log.i("Testdb", "Data uploaded to Firestore successfully")
                         fireBaseUpload.postValue("Success")
                         testDetails.localFlag = true
+                        uploadResult(MolbioV2ResultRequest(listOf(MolbioV2Result(rawData = testDetails))))
                         hemoCubeDao.insertAll(testDetails)
                     }
 
@@ -181,6 +241,8 @@ class HemoCubeViewModel @Inject constructor(
                         fireBaseUpload.postValue("Error")
                         hemoCubeDao.insertAll(testDetails)
                     }
+
+                    else -> {}
                 }
             } catch (e: Exception) {
                 Log.e("Testdb", "Exception during data upload: ${e.message}")
@@ -203,6 +265,8 @@ class HemoCubeViewModel @Inject constructor(
                         Log.e("Testdb", "Error uploading data to Firestore: $response")
                         fireBaseUpload.postValue("Error")
                     }
+
+                    else -> {}
                 }
             } catch (e: Exception) {
                 Log.e("Testdb", "Exception during data upload: ${e.message}")
@@ -233,6 +297,10 @@ class HemoCubeViewModel @Inject constructor(
         hemoCubeDao.updateFieldById(id = userId, true)
     }
 
+    fun updateMolbioFlag(userId: String) = viewModelScope.launch {
+        hemoCubeDao.updateFieldById(id = userId, true)
+    }
+
     fun addUser(userData: HemoCubeTestData) = viewModelScope.launch {
         hemoCubeDao.insertAll(userData)
     }

From ae42c96256c9dbd895243681e307da7b00b093f9 Mon Sep 17 00:00:00 2001
From: Mariya <mariya@sminnovations.in>
Date: Wed, 3 Jan 2024 15:31:58 +0530
Subject: [PATCH 5/5] Toast Message is Added, if the device is connected

---
 .../java/com/example/hpostesting/presentation/MainActivity.kt   | 1 +
 .../hpostesting/presentation/dashboard/DashboardActivity.kt     | 2 --
 app/src/main/res/values/strings.xml                             | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
index 91763ae..d5d1b9f 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
@@ -104,6 +104,7 @@ class MainActivity : AppCompatActivity() {
         val deviceType = when {
             availableDrivers.isNotEmpty() -> {
                 val device = availableDrivers[0].device
+                Toast.makeText(this, R.string.device, Toast.LENGTH_SHORT).show()
                 when {
                     device.productId == Constants.HOMO_CUBE_ID && device.vendorId == Constants.VENDOR_ID -> {
                         binding.cvItem1.visibility = View.VISIBLE
diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
index 584138a..9bf5207 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
@@ -27,8 +27,6 @@ class DashboardActivity : AppCompatActivity() {
 
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityDashboardBinding
-    val appUpdateManager: AppUpdateManager = AppUpdateManagerFactory.create(applicationContext)
-    val appUpdateInfoTask = appUpdateManager.appUpdateInfo
     override fun attachBaseContext(newBase: Context?) {
         val languageCode = LanguageManager.getSavedLanguage(newBase!!)
         LanguageManager.setLocale(newBase, languageCode)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 47fd564..80d0e69 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -232,6 +232,7 @@
     <string name="permission_grant">You must grant permission to access all files to use the app</string>
     <string name="permission_required">All permissions are required to use the app.</string>
     <string name="device_not">Device Not Connected.</string>
+    <string name="device">Device is Connected.</string>
     <string name="enter_proper_login_id">Please enter a proper Login ID</string>
     <string name="enter_proper_password">Please enter a proper password</string>
     <string name="wrong_password">Wrong Password</string>