Result API, NATS and work manager

.idea/gradle.xml

@@ -5,7 +5,6 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
@@ -14,6 +13,7 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

app/build.gradle

@@ -14,13 +14,13 @@ android {
     compileSdk 34
     namespace 'in.sminnovations.hpostesting'
 
-    // prod - production, preprod - preproduction, quality - qc,
+    // prod - production, preprod - preproduction, quality - qc
     defaultConfig {
         applicationId "in.sminnovations.hpostesting"
         minSdk 21
         targetSdk 34
-        versionCode 51
-        versionName "2.1.51"
+        versionCode 56
+        versionName "2.1.56"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -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:5.9'
+    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"
@@ -132,7 +135,12 @@ 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"
+    implementation 'io.nats:jnats:2.11.2'
 
+    implementation("androidx.work:work-runtime-ktx:2.9.0")
+
+    implementation("io.nats:jnats:2.11.2")
 }

app/src/main/assets/app.properties

@@ -0,0 +1 @@
+BASE_URL= https://datacollection.micropcr.com/api/

app/src/main/java/com/example/hpostesting/data/FileUploader.kt

@@ -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
-    }
-
-}

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>()
+}

app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt

@@ -0,0 +1,21 @@
+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.login.LoginRequest
+import com.example.hpostesting.data.model.login.LoginResponse
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface MolbioAuthApi {
+
+    @POST("deviceManagement/device/provision")
+    suspend fun deviceProvision(
+        @Body deviceProvisionRequest: DeviceProvisionRequest
+    ): DeviceProvisionResponse
+
+    @POST("deviceService/device/login")
+    suspend fun login(
+        @Body loginRequest: LoginRequest
+    ): LoginResponse
+}

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
+}

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
+}

app/src/main/java/com/example/hpostesting/data/constant/Constants.kt

@@ -4,8 +4,22 @@ 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 NATS_TOKEN_EXPIRE_DATE = "natsTokenExpireDate"
+
     const val WRITE_TIMEOUT_MILLIS = 30000   // 30 sec
     const val READ_TIMEOUT_MILLIS = 60000   // 1 min
     const val DELAY_BETWEEN_COMMANDS: Long = 1000
@@ -29,6 +43,8 @@ object Constants {
     const val DEVICE_VENDOR_ID = 1027
     const val HOMO_CUBE_ID = 29987
     const val VENDOR_ID = 6790
+    const val HEMO_CUBE_V2_PRODUCT_ID = 24577
+    const val HEMO_CUBE_V2_VENDOR_ID = 1027
 
     const val ERROR_NORMAL = 400
     const val ERROR_CRITICAL = 401
@@ -38,6 +54,7 @@ object Constants {
     const val USER_ID = "usernameId"
 
     val STATICID = listOf(
+        "ADMIN",
         "VIZ-1000-0004",
         "VIZ-1000-0005",
         "VIZ-1000-0006",
@@ -63,6 +80,14 @@ object Constants {
         "HC-V1-020",
         "HCV-000-3001",
         "HCV-000-3002",
+        "HCV-000-3003",
+        "HCV-000-3004",
+        "HCV-000-3005",
+        "HCV-000-3006",
+        "HCV-000-3007",
+        "HCV-000-3008",
+        "HCV-000-3009",
+        "HCV-000-3010"
     )
 
     const val password = "SMI@12345"
@@ -78,6 +103,19 @@ object Constants {
     const val BUFFER_LED_LOWER_BOUND = 21000
     const val BUFFER_LED_UPPER_BOUND = 24500
 
+    const val TEST_STATUS_CODE_TEST_STARTED = 1.0
+    const val TEST_STATUS_CODE_CONFIG_STARTED = 2.0
+    const val TEST_STATUS_CODE_CONFIG_COMPLETED = 3.0
+    const val TEST_STATUS_CODE_BUFFER_STARTED = 4.0
+    const val TEST_STATUS_CODE_BUFFER_COMPLETED = 5.0
+    const val TEST_STATUS_CODE_BUFFER_PRINT_STARTED = 6.0
+    const val TEST_STATUS_CODE_BUFFER_PRINT_COMPLETED = 7.0
+    const val TEST_STATUS_CODE_SAMPLE_STARTED = 8.0
+    const val TEST_STATUS_CODE_SAMPLE_COMPLETED = 9.0
+    const val TEST_STATUS_CODE_SAMPLE_PRINT_STARTED = 10.0
+    const val TEST_STATUS_CODE_SAMPLE_PRINT_COMPLETED = 11.0
+    const val TEST_STATUS_CODE_TEST_COMPLETED = 12.0
+
     val DEVICE_CONFIGURATION: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
         "HCV-000-3001" to listOf(
             listOf(1.313, -0.89),           // LED1, 435nm
@@ -98,15 +136,52 @@ object Constants {
             listOf(1.0, 0.0)                    // LED4
         ),
         "HCV-000-3004" to listOf(
-            listOf(1.6837, -1.1417),         // LED1, 435nm
+            listOf(1.7272, -1.1977),            // LED1, 435nm
             listOf(0.581462456, -0.58502),      // LED2, 415nm
-            listOf(0.2241, -0.0106),           // LED3, 555nm
+            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3005" to listOf(
+            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3006" to listOf(
+            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3007" to listOf(
+            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3008" to listOf(
+            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3009" to listOf(
+            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3010" to listOf(
+            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.2304, -0.0145),            // LED3, 555nm
             listOf(1.0, 0.0)                    // LED4
         ),
     )
 
     const val INCUBATION_TIME_MIN = 0
     const val INCUBATION_TIME_MAX = 1400
+    const val BATTERY_LEVEL_MIN = 0
 
     val BUFFER_INTENSITY_THRESHOLDS: Map<String, List<List<Int>>> = mapOf<String, List<List<Int>>>(
         "HCV-000-3001" to listOf(
@@ -132,6 +207,42 @@ object Constants {
             listOf(24500, 26250),
             listOf(24500, 26250),
             listOf(24500, 26250),
+        ),
+        "HCV-000-3005" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3006" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3007" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3008" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3009" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3010" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         )
     )
 }

app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt

@@ -24,6 +24,6 @@ interface HemoCubeDao {
     @Query("UPDATE hemo_cube_test_table SET localFlag = :newValue WHERE _id = :id")
     suspend fun updateFieldById(id: String, newValue: Boolean)
 
-    @Query("UPDATE hemo_cube_test_table SET isCSVCreated = :newValue WHERE _id = :id")
-    suspend fun updateCSVFieldById(id: String, newValue: Boolean)
+    @Query("UPDATE hemo_cube_test_table SET molbioFlag = :newValue WHERE _id = :id")
+    suspend fun updateMolbioFlag(id: String, newValue: Boolean)
 }

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 = 12, exportSchema = false)
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 15, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao

app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt

@@ -1,21 +1,18 @@
 package com.example.hpostesting.data.datasource
 
-import android.os.Environment
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.opencsv.CSVWriter
 import java.io.File
 import java.io.FileWriter
-import java.io.IOException
 
 class LocalFileDataSource {
 
-    fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>) {
+    fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>){
         val writer = CSVWriter(FileWriter(filepath))
         writer.writeAll(contents) // data is adding to csv
         writer.close()
     }
 
-    fun saveTextToDisk(filepath: String, contents: String) {
+    fun saveTextToDisk(filepath: String, contents: String){
         val writer = FileWriter(File(filepath))
 
         writer.append(contents)
@@ -23,138 +20,4 @@ class LocalFileDataSource {
         writer.close()
     }
 
-    fun exportDataToCSV(
-        fileName: String, dataList: List<HemoCubeTestData>
-    ): Boolean {
-        try {
-            val formattedFileName = fileName.replace(Regex("[^a-zA-Z0-9.-]"), "_") // Replace special characters with underscores
-            val filePath = File(getExternalStorageDirectory(), formattedFileName)
-            val writer = FileWriter(filePath)
-            val csvWriter = CSVWriter(writer)
-            // Write CSV header
-            val header = arrayOf(
-                "_id",
-                "name",
-                "incubationTime",
-                "bloodGroup",
-                "birthYear", // Include other fields from the data class
-                "state",
-                "abhaId",
-                "userImageURL",
-                "location",
-                "reportUploadTime",
-                "testType",
-                "testTime",
-                "testStatus",
-                "gender",
-                "localFlag", // Add more fields as necessary
-                "deviceId",
-                "appVersion",
-                "deviceSerialNumber",
-                "deviceType",
-                "kitSerial",
-                "resultData",
-                "led1Buffer",
-                "led2Buffer",
-                "led3Buffer",
-                "led4Buffer",
-                "led1Sample",
-                "led2Sample",
-                "led3Sample",
-                "led4Sample",
-                "led1Average",
-                "led2Average",
-                "led3Average",
-                "led4Average",
-                "abs1",
-                "abs2",
-                "abs3",
-                "abs4",
-                "deviceRatio",
-                "calculatedRatio",
-                "predictedDenovixRatio",
-                "coefficients",
-                "classificationResult",
-                "prdClassification",
-                "errorMessages",
-                "batteryLevel",
-                "batteryCapacity",
-                "batteryMaxCapacity",
-                "batteryTemperature",
-                "batteryVoltage"
-            )
-            csvWriter.writeNext(header)
-
-            // Write data rows
-            for (data in dataList) {
-                val row = arrayOf(
-                    data._id,
-                    data.name,
-                    data.incubationTime,
-                    data.bloodGroup,
-                    data.birthYear, // Include other fields similarly
-                    data.state,
-                    data.abhaId,
-                    data.userImageURL,
-                    data.location?.toString(),
-                    data.reportUploadTime ?: "",
-                    data.testType ?: "",
-                    data.testTime ?: "",
-                    data.testStatus?.toString() ?: "",
-                    data.gender,
-                    data.localFlag.toString(),
-                    data.deviceId ?: "",
-                    data.appVersion ?: "",
-                    data.deviceSerialNumber,
-                    data.deviceType,
-                    data.kitSerial,
-                    data.resultData,
-                    data.led1Buffer?.toString() ?: "",
-                    data.led2Buffer?.toString() ?: "",
-                    data.led3Buffer?.toString() ?: "",
-                    data.led4Buffer?.toString() ?: "",
-                    data.led1Sample?.toString() ?: "",
-                    data.led2Sample?.toString() ?: "",
-                    data.led3Sample?.toString() ?: "",
-                    data.led4Sample?.toString() ?: "",
-                    data.led1Average?.toString() ?: "",
-                    data.led2Average?.toString() ?: "",
-                    data.led3Average?.toString() ?: "",
-                    data.led4Average?.toString() ?: "",
-                    data.abs1?.toString() ?: "",
-                    data.abs2?.toString() ?: "",
-                    data.abs3?.toString() ?: "",
-                    data.abs4?.toString() ?: "",
-                    data.deviceRatio?.toString() ?: "",
-                    data.calculatedRatio?.toString() ?: "",
-                    data.predictedDenovixRatio?.toString() ?: "",
-                    data.coefficients ?: "",
-                    data.classificationResult,
-                    data.prdClassification,
-                    data.errorMessages,
-                    data.batteryLevel,
-                    data.batteryCapacity,
-                    data.batteryMaxCapacity,
-                    data.batteryTemperature,
-                    data.batteryVoltage
-                )
-                csvWriter.writeNext(row)
-            }
-            writer.close()
-            return true
-        } catch (e: IOException) {
-            e.printStackTrace()
-            return false
-        }
-    }
-
-    private fun getExternalStorageDirectory(): File {
-        val folder = File(Environment.getExternalStorageDirectory(), "HposFolder")
-
-        if (!folder.exists()) {
-            folder.mkdirs()
-        }
-
-        return folder
-    }
 }

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? = ""
+)

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
+)

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()
+)

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? = ""
+)

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? = ""
+)

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
+)

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? = ""
+)

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? = ""
+)

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? = ""
+)

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
+)

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
+)

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? = ""
+)

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()
+)

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? = ""
+)

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? = ""
+)

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? = 31,
+    val analysisDate: String? = "",
+    val analysisId: String? = "",
+    val analysisStatus: String? = "",
+    val analysisType: String? = "HPOS",
+    val analysisTypeMethod: String? = "",
+    val bloodGroup: String? = "",
+    val coefficients: List<Int>? = listOf(22, 22),
+    val collectionLocation: List<Any>? = listOf(),
+    val collectionTime: String? = "",
+    val collector: String? = "",
+    val curveFitting: String? = "Linear",
+    val deviceName: String? = "HPOS",
+    val expiryTime: String? = "",
+    val gender: String? = "",
+    val interpretation: String? = "",
+    val `operator`: String? = "",
+    val patientId: Int? = 4545,
+    val pregnancy: Boolean? = false,
+    val rawData: HemoCubeTestData? = HemoCubeTestData(),
+    val recommendation: String? = "NA",
+    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? = 2
+)

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
+)

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()
+)

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? = ""
+)

app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt

@@ -0,0 +1,55 @@
+package com.example.hpostesting.data.model.molbioresult
+
+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 = "",
+)

app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt

@@ -55,5 +55,5 @@ data class HemoCubeTestData(
     var batteryMaxCapacity: String = "",
     var batteryTemperature: String = "",
     var batteryVoltage: String = "",
-    var isCSVCreated: Boolean = false
+    var molbioFlag: Boolean = false
 )

app/src/main/java/com/example/hpostesting/data/model/test/TestDetails.kt

@@ -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
-}

app/src/main/java/com/example/hpostesting/data/model/test/TestInfo.kt

@@ -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
-)

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? = ""
+)

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? = ""
+)

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? = ""
+)

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? = ""
+)

app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt

@@ -1,37 +1,97 @@
 package com.example.hpostesting.data.repository
 
 import android.net.Uri
+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 java.net.ConnectException
+import java.net.SocketTimeoutException
 import javax.inject.Inject
+import javax.inject.Named
 
-class DatabaseRepository @Inject constructor() : Repository {
+class NetworkException(message: String, cause: Throwable) : Exception(message, cause)
+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
 
+    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 { molbioAuthApi.deviceProvision(deviceProvisionRequest) }
+    }
+
+    suspend fun login(loginRequest: LoginRequest): Result<LoginResponse> {
+        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)
         }
@@ -39,14 +99,15 @@ class DatabaseRepository @Inject constructor() : Repository {
 
     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)
@@ -56,7 +117,7 @@ class DatabaseRepository @Inject constructor() : Repository {
     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)
@@ -66,14 +127,16 @@ class DatabaseRepository @Inject constructor() : Repository {
     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))

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)
+    }
+}

app/src/main/java/com/example/hpostesting/domain/CheckUpdateWorker.kt

@@ -0,0 +1,28 @@
+package com.example.hpostesting.domain
+
+import android.content.Context
+import android.util.Log
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.withContext
+
+class CheckUpdateWorker(
+    context: Context,
+    workerParams: WorkerParameters
+) : CoroutineWorker(context, workerParams) {
+
+    override suspend fun doWork(): Result = withContext(Dispatchers.IO) {
+        try {
+            for (i in 1..900){
+                delay(1000)
+                Log.d("Work for every second", "doWork: Running")
+            }
+
+            Result.success()
+        } catch (e: Exception) {
+            Result.failure()
+        }
+    }
+}

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
+        }
+    }
+}

app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt

@@ -2,7 +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.MolbioAuthApi
+import com.example.hpostesting.data.api.MolbioResultApi
+import com.example.hpostesting.data.api.PropertyProvider
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
 import com.example.hpostesting.data.dao.UserDao
@@ -10,13 +15,21 @@ 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
 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 java.util.concurrent.TimeUnit
+import javax.inject.Named
 import javax.inject.Singleton
 
 @Module
@@ -65,19 +78,89 @@ object AppModule {
 
     @Provides
     @Singleton
-    fun provideDatabaseRepository(): DatabaseRepository {
-        return DatabaseRepository()
+    fun provideDatabaseRepository(
+        @Named("Auth") molbioAuthApi: MolbioAuthApi,
+        molbioResultApi: MolbioResultApi
+    ): DatabaseRepository {
+        return DatabaseRepository(molbioAuthApi = molbioAuthApi, molbioResultApi = molbioResultApi)
     }
 
     @Provides
     @Singleton
-    fun provideRepository(): Repository {
-        return DatabaseRepository()
+    fun provideRepository(
+        @Named("Auth") molbioAuthApi: MolbioAuthApi,
+        molbioResultApi: MolbioResultApi
+    ): Repository {
+        return DatabaseRepository(molbioAuthApi, molbioResultApi)
     }
 
     @Provides
     @Singleton
-    fun provideLocalFileDataSource(): LocalFileDataSource {
-        return LocalFileDataSource()
+    fun provideAssetManager(@ApplicationContext context: Context): AssetManager {
+        return context.assets
     }
+
+    @Provides
+    @Singleton
+    fun providePropertyProvider(assetManager: AssetManager): PropertyProvider {
+        return PropertyProviderImpl(assetManager)
+    }
+
+    @Provides
+    @Singleton
+    fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
+        return context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+    }
+
+    @Provides
+    @Singleton
+    fun provideAuthInterceptor(sharedPreferences: SharedPreferences): AuthInterceptor {
+        return AuthInterceptor(sharedPreferences)
+    }
+
+    @Provides
+    @Singleton
+    @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)
 }

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
@@ -114,6 +115,15 @@ class MainActivity : AppCompatActivity() {
                         Constants.DEVICE_TYPE_HOMOCUBE
                     }
 
+                    device.productId == Constants.HEMO_CUBE_V2_PRODUCT_ID && device.vendorId == Constants.HEMO_CUBE_V2_VENDOR_ID -> {
+                        binding.cvItem1.visibility = View.VISIBLE
+                        binding.cvItem3.visibility = View.VISIBLE
+                        binding.cvItem2.visibility = View.GONE
+                        binding.cvItem4.visibility = View.GONE
+                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
+                        Constants.DEVICE_TYPE_HOMOCUBE
+                    }
+
                     device.productId == Constants.DEVICE_PRODUCT_ID && device.vendorId == Constants.DEVICE_VENDOR_ID -> {
                         Log.d(
                             TAG,

app/src/main/java/com/example/hpostesting/presentation/NatsManager.kt

@@ -0,0 +1,134 @@
+package com.example.hpostesting.presentation
+
+import android.util.Log
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import io.nats.client.AuthHandler
+import io.nats.client.Connection
+import io.nats.client.Message
+import io.nats.client.NKey
+import io.nats.client.Nats
+import io.nats.client.Options
+import java.io.IOException
+import java.nio.charset.StandardCharsets
+import java.security.GeneralSecurityException
+
+
+class NatsManager(datacollector: DashboardActivity) {
+
+    val TAG = "Nats Service"
+    var nc: Connection? = null
+    val datacollector = datacollector
+    var connect = false
+
+    fun connect() {
+        Log.d(TAG, "TRY TO CONNECT")
+        Thread {
+
+            val seedString = "SUAK5IDCMHY4T2WA2LHNXGICGHKR3TPJFNSP6AUQP523RLANO4PSR6IEYA"
+            val seedBytes = seedString.toCharArray()
+
+            val theNKey = NKey.fromSeed(seedBytes) // really should load from somewhere
+
+            val options = Options.Builder()
+                .server("nats://192.168.10.117:4222")
+                .authHandler(object : AuthHandler {
+                    override fun getID(): CharArray? {
+                        return try {
+                            theNKey?.publicKey
+                        } catch (ex: GeneralSecurityException) {
+                            null
+                        } catch (ex: IOException) {
+                            null
+                        } catch (ex: NullPointerException) {
+                            null
+                        }
+                    }
+
+                    override fun sign(nonce: ByteArray): ByteArray? {
+                        return try {
+                            theNKey?.sign(nonce)
+                        } catch (ex: GeneralSecurityException) {
+                            null
+                        } catch (ex: IOException) {
+                            null
+                        } catch (ex: NullPointerException) {
+                            null
+                        }
+                    }
+
+                    override fun getJWT(): CharArray? {
+                        return null
+                    }
+                })
+                .build()
+
+            try {
+                nc = Nats.connect(options)
+                Log.d(TAG, "Connected to Nats server ${options.servers.first()}")
+                connect = true
+                datacollector.setConnect(true)
+
+
+                nc?.publish(
+                    "server.hpos.HCV-000-3001.ping",
+                    "ALIVE".toByteArray(StandardCharsets.UTF_8)
+                )
+                nc?.publish(
+                    "server.hpos.HCV-000-3001.health",
+                    "ALIVE".toByteArray(StandardCharsets.UTF_8)
+                )
+                Log.d(TAG, "Published msg server.hpos.HCV-000-3001.ping on topic Testing")
+                val d = nc?.createDispatcher { msg: Message? ->
+                    println("PRITIMOI SARKAR $msg")
+                }
+
+                d?.subscribe("device.hpos.HCV-000-3001.update") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector. setResponse(response)
+                    println("Message received (up to 100 times): $response")
+                }
+
+                d?.subscribe("device.hpos.HCV-000-3001.uploadlogs") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response + "uPLOAD")
+                    println("Message received (up to 100 times): $response")
+                }
+
+                d?.subscribe("device.hpos.HCV-000-3001.disable") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response)
+                    println("Message received (up to 100 times): $response")
+                }
+
+                d?.subscribe("device.hpos.HCV-000-3001.updatecustomer") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response)
+                    println("Message received (up to 100 times): $response")
+                }
+
+                d?.subscribe("device.hpos.HCV-000-3001.checkupdate") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response)
+                    println("Message received (up to 100 times): $response")
+                }
+
+            } catch (exp: Exception) {
+                println(exp.printStackTrace())
+                connect = false
+                datacollector.setConnect(true)
+            }
+        }.start()
+
+    }
+
+    fun pub(topic: String, msg: String) {
+        nc?.publish(topic, msg.toByteArray(StandardCharsets.UTF_8))
+        Log.d(TAG, "Published msg ${msg} on topic ${topic}")
+    }
+
+    fun close() {
+        nc?.close()
+        Log.d(TAG, "Nats connection close")
+    }
+
+}

app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt

@@ -1,7 +1,6 @@
 package com.example.hpostesting.presentation.adapter
 
 import android.content.Context
-import android.content.res.Resources
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -65,7 +64,7 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
                 if (batLevel < 40) {
                     Toast.makeText(
                         view.context,
-                        R.string.low_battery_warning,
+                        context?.getString(R.string.low_battery_warning),
                         Toast.LENGTH_SHORT
                     ).show()
                     return@setOnClickListener
@@ -74,7 +73,7 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
                     if (userList.testStatus!!) {
                         Toast.makeText(
                             view.context,
-                            R.string.test_already_conducted,
+                            context?.getString(R.string.test_already_conducted),
                             Toast.LENGTH_SHORT
                         ).show()
                     } else {
@@ -82,13 +81,13 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
                             if (isBetween15And30Minutes(userList.incubationTime) < Constants.INCUBATION_TIME_MIN) {
                                 Toast.makeText(
                                     view.context,
-                                    R.string.incubation_not_completed,
+                                    context?.getString(R.string.incubation_not_completed),
                                     Toast.LENGTH_SHORT
                                 ).show()
                             } else if (isBetween15And30Minutes(userList.incubationTime) > Constants.INCUBATION_TIME_MAX) {
                                 Toast.makeText(
                                     view.context,
-                                    R.string.incubation_crossed_30_minutes,
+                                    context?.getString(R.string.incubation_crossed_30_minutes),
                                     Toast.LENGTH_SHORT
                                 ).show()
                             } else {
@@ -103,7 +102,7 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
                         } else {
                             Toast.makeText(
                                 view.context,
-                                R.string.incubation_not_started,
+                                context?.getString(R.string.incubation_not_started),
                                 Toast.LENGTH_SHORT
                             ).show()
                         }

app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt

@@ -26,6 +26,7 @@ import android.widget.AutoCompleteTextView
 import androidx.core.content.ContextCompat.getSystemService
 import androidx.core.content.getSystemService
 import androidx.fragment.app.FragmentActivity
+import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.google.firebase.firestore.FirebaseFirestore
 
@@ -196,7 +197,7 @@ class UserListAdapter(
 //                    }
             }
             userCard.setOnClickListener {
-                if (batLevel < 40) {
+                if (false) {
                     Toast.makeText(
                         view.context,
                         context?.getString(R.string.low_battery_warning),
@@ -213,13 +214,13 @@ class UserListAdapter(
                         ).show()
                     } else {
                         if (model.incubationTime != "") {
-                            if (isBetween15And30Minutes(model.incubationTime) < 0) {
+                            if (isBetween15And30Minutes(model.incubationTime) < 15) {
                                 Toast.makeText(
                                     view.context,
                                     context?.getString(R.string.incubation_not_completed),
                                     Toast.LENGTH_SHORT
                                 ).show()
-                            } else if (isBetween15And30Minutes(model.incubationTime) > 140000) {
+                            } else if (isBetween15And30Minutes(model.incubationTime) > 30) {
                                 Toast.makeText(
                                     view.context,
                                     context?.getString(R.string.incubation_crossed_30_minutes),

app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt

@@ -2,6 +2,7 @@ package com.example.hpostesting.presentation.dashboard
 
 import android.content.Context
 import android.os.Bundle
+import android.util.Log
 import android.view.Menu
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -12,7 +13,11 @@ import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.presentation.NatsManager
 import com.google.android.material.navigation.NavigationView
+import com.google.android.material.progressindicator.LinearProgressIndicator
+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
@@ -20,12 +25,17 @@ import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
 
+open interface IDataCollector {
+    fun setConnect(connect: Boolean)
+    fun setResponse(response: String)
+}
 @AndroidEntryPoint
-class DashboardActivity : AppCompatActivity() {
+class DashboardActivity : AppCompatActivity(), IDataCollector {
 
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityDashboardBinding
-
+    var responses: String = ""
+    lateinit var nats: NatsManager
     override fun attachBaseContext(newBase: Context?) {
         val languageCode = LanguageManager.getSavedLanguage(newBase!!)
         LanguageManager.setLocale(newBase, languageCode)
@@ -38,6 +48,9 @@ class DashboardActivity : AppCompatActivity() {
         binding = ActivityDashboardBinding.inflate(layoutInflater)
         setContentView(binding.root)
         setSupportActionBar(binding.appBarDashboard.toolbar)
+        nats = NatsManager(this)
+//        nats.connect()
+//        nats.pub("server.hpos.HCV-000-3001.ping", "THIS IS A TEST MSG")
 
         val drawerLayout: DrawerLayout = binding.drawerLayout
         val navView: NavigationView = binding.navView
@@ -103,4 +116,16 @@ class DashboardActivity : AppCompatActivity() {
 //                Toast.makeText(this, "App Update: Success!", Toast.LENGTH_SHORT).show()
             }
     }
+
+    override fun setConnect(connect: Boolean) {
+        if(connect){
+            Log.i("NATS Connection", connect.toString())
+        }
+    }
+
+    override fun setResponse(response: String) {
+
+        responses = responses+response+"\n"
+        println(responses)
+    }
 }

app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt

@@ -8,7 +8,7 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.os.BatteryManager
 import android.os.Bundle
-import android.util.Log
+import android.util.Base64
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,9 +17,13 @@ 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.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.presentation.KitScanActivity
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
 import com.example.hpostesting.presentation.adapter.UserListAdapter
@@ -34,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
@@ -73,7 +78,6 @@ class HomeFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        checkUnprocessedCSVData()
         viewModel.allUserData.observe(viewLifecycleOwner) { userData ->
             deleteIncompleteRegistrations(userData)
         }
@@ -100,6 +104,7 @@ class HomeFragment : Fragment() {
                 loadUserData()
                 setSearch()
                 checkForLocalDBData()
+                checkForTokenAndUpdate()
             } else {
                 binding.internetAvailableCL.visibility = View.GONE
                 binding.internetNotAvailableCL.visibility = View.VISIBLE
@@ -132,9 +137,130 @@ class HomeFragment : Fragment() {
             startActivity(Intent(requireContext(), KitScanActivity::class.java))
             requireActivity().finish()
         }
-        binding.downloadCSV.setOnClickListener {
-            showDownloadDialog(requireContext())
+    }
+
+    private fun checkForTokenAndUpdate() {
+        val accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
+        val natsToken = sharedPreference.getString(Constants.NATS_TOKEN, "").toString()
+        val natsTokenExpireDate = sharedPreference.getString(Constants.NATS_TOKEN_EXPIRE_DATE, "").toString()
+        if (accessToken.isEmpty() && natsToken.isEmpty()) {
+            hemoCubeViewModel.login(createLoginRequestData())
+        } else {
+            if (isTokenExpired(accessToken)) {
+                hemoCubeViewModel.login(createLoginRequestData())
+            } else {
+                hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
+                hemoCubeViewModel.uploadLogs()
+                hemoCubeViewModel.startPeriodicCheckUpdate()
+            }
         }
+        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 -> {
+                    response.exception.let { message ->
+                        Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
+                            .show()
+                    }
+                }
+
+                is Result.Loading -> {
+
+                }
+
+                else -> {}
+            }
+        }
+    }
+
+    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)
+            putString(Constants.NATS_TOKEN, response.data.data?.deviceUser?.natsToken)
+            putString(Constants.NATS_TOKEN_EXPIRE_DATE, response.data.data?.deviceUser?.natsTokenExpiry)
+            apply()
+        }
+    }
+
+    private fun createLoginRequestData(): LoginRequest {
+        return LoginRequest(
+            password = Constants.devicePassword,
+            serialNumber = Constants.deviceID,
+            username = Constants.deviceID
+        )
+    }
+
+    private fun createCheckUpdateRequestData(): CheckUpdateRequest {
+        val pInfo = requireActivity().packageManager.getPackageInfo(
+            requireActivity().packageName, 0
+        )
+        val version = pInfo.versionName
+        return CheckUpdateRequest(
+            currentVersion = version
+        )
     }
 
     private fun setUserId() {
@@ -322,14 +448,6 @@ class HomeFragment : Fragment() {
         }
     }
 
-    private fun checkUnprocessedCSVData() {
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val downloadDataVisibility =
-                if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.VISIBLE else View.GONE
-            binding.downloadCSV.visibility = downloadDataVisibility
-        }
-    }
-
     private fun showUploadDialog(context: Context) {
         val builder = AlertDialog.Builder(context)
         builder.setTitle(R.string.upload_db_registration_title)
@@ -347,23 +465,6 @@ class HomeFragment : Fragment() {
         dialog.show()
     }
 
-    private fun showDownloadDialog(context: Context) {
-        val builder = AlertDialog.Builder(context)
-        builder.setTitle(R.string.download_db_registration_title)
-        builder.setMessage(R.string.download_db_registration_message)
-
-        builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
-            downloadLocalDBData(dialog)
-        }
-
-        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
-            dialog.dismiss()
-        }
-
-        val dialog = builder.create()
-        dialog.show()
-    }
-
     private fun uploadLocalDBData(dialog: DialogInterface) {
         viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             if (userDataList.isEmpty()) {
@@ -391,28 +492,6 @@ class HomeFragment : Fragment() {
         }
     }
 
-    private fun downloadLocalDBData(dialog: DialogInterface) {
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val downloadList = mutableListOf<HemoCubeTestData>()
-
-            userDataList.forEach { userData ->
-                if (!userData.isCSVCreated) {
-                    downloadList.add(userData) // Add the userData to downloadList
-                }
-            }
-
-            if (downloadList.isNotEmpty()) {
-                // Call ViewModel function to create CSV with filtered data
-                hemoCubeViewModel.createCSV(downloadList, requireContext())
-                Toast.makeText(requireContext(), "Done", Toast.LENGTH_SHORT).show()
-            } else {
-                Toast.makeText(requireContext(), "Failed", Toast.LENGTH_SHORT).show()
-            }
-
-            dialog.dismiss()
-        }
-    }
-
     private fun deleteIncompleteRegistrations(userDataList: List<UserData>) {
         userDataList.forEach { userData ->
             if (userData.csvPath.isEmpty()) {

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
     }
 

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt

@@ -9,10 +9,12 @@ 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
 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
@@ -57,6 +59,7 @@ class HemoCubeFragment : Fragment() {
     private var validationError = false
     private var deviceHardwareId = ""
     private var allErrorMessages = ""
+    private var testStatusCode = 0.0
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
@@ -121,21 +124,42 @@ class HemoCubeFragment : Fragment() {
 
         }
 
+        if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+            activity?.runOnUiThread {
+                binding.tvDeviceMessages.visibility = View.VISIBLE
+            }
+        }
     }
 
     private fun observeViewModel() {
         hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 showToast(R.string.test_upload)
+                hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
+                    when (it) {
+                        is Result.Success -> {
+                            it.data.data?.get(0)?.rawData?.let { it1 ->
+                                hemoCubeViewModel.updateMolbioFlag(
+                                    it1._id)
+                                activity?.runOnUiThread {
+                                    binding.btnSubmit.visibility = View.GONE
+                                    val i = Intent(
+                                        requireContext().applicationContext,
+                                        DashboardActivity::class.java
+                                    )
+                                    startActivity(i)
+                                }
+                            }
+                        }
+                        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()
+                            }
+                        }
 
-                activity?.runOnUiThread {
-                    binding.btnSubmit.visibility = View.GONE
-                    binding.btnDigitalCard.visibility = View.VISIBLE
-                    binding.btnDigitalCard.setOnClickListener {
-                        val i = Intent(
-                            requireContext().applicationContext, DigitalCardActivity::class.java
-                        )
-                        startActivity(i)
+                        else -> {}
                     }
                 }
             }
@@ -173,6 +197,10 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
         }
+
+        hemoCubeViewModel.deviceMessages.observe(viewLifecycleOwner) {
+            binding.tvDeviceMessages.text = it
+        }
     }
 
     private fun checkAndStartProcess() {
@@ -253,7 +281,7 @@ class HemoCubeFragment : Fragment() {
                     data?.let {
                         val stringData = String(it)
                         fullReadOutput.append(stringData)
-                        handleUsbData(stringData, fullReadOutput)
+                        handleUsbData(stringData, testStatusCode)
                     }
                 }
 
@@ -286,23 +314,29 @@ class HemoCubeFragment : Fragment() {
             })
     }
 
-    private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
+    private fun handleUsbData(stringData: String, testStatusCode: Double) {
         if (stringData.contains("#")) {
             isTestOngoing = true
         }
 
         resultData += stringData
+        hemoCubeViewModel.deviceMessages.postValue(resultData)
 
         when {
-            stringData.contains("SN") -> {
-                val slData = stringData.split(" ")
-                if (slData.size > 1) {
-                    val hardwareId = slData[1].trim()
-                    deviceHardwareId = hardwareId
+            resultData.contains("SNE") && this.testStatusCode < Constants.TEST_STATUS_CODE_CONFIG_COMPLETED -> {
+                val pattern = Regex("HCV-\\d{3}-\\d{4}")
+                val matchResult = pattern.find(resultData)
+                val hardwareId = matchResult?.value
+
+                if (hardwareId.toString().length == 12) {
+                    deviceHardwareId += hardwareId
                     with(sharedPreferences.edit()) {
-                        putString(Constants.DEVICE_ID, hardwareId)
+                        putString(Constants.DEVICE_ID, deviceHardwareId)
                         apply()
                     }
+                    this.testStatusCode = Constants.TEST_STATUS_CODE_CONFIG_COMPLETED
+                } else {
+                    hemoCubeViewModel.messages.postValue("Config error")
                 }
                 activity?.runOnUiThread {
                     binding.btnPlacebuffer.visibility = View.VISIBLE
@@ -310,32 +344,37 @@ class HemoCubeFragment : Fragment() {
                 hemoCubeViewModel.messages.postValue(getString(R.string.start))
             }
 
-            stringData.contains("#BS") -> {
+            resultData.contains("#BS") && this.testStatusCode < Constants.TEST_STATUS_CODE_BUFFER_STARTED -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.buffer_started))
+                this.testStatusCode = Constants.TEST_STATUS_CODE_BUFFER_STARTED
             }
 
-            stringData.contains("#BC") -> {
+            resultData.contains("#BC") && this.testStatusCode < Constants.TEST_STATUS_CODE_BUFFER_COMPLETED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_BUFFER_COMPLETED
                 activity?.runOnUiThread {
                     binding.tvSubtitle4.text = getString(R.string.buffer_completed)
                     binding.btnSamplestart.visibility = View.VISIBLE
                 }
             }
 
-            stringData.contains("#SS") -> {
+            resultData.contains("#SS") && this.testStatusCode < Constants.TEST_STATUS_CODE_SAMPLE_STARTED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_SAMPLE_STARTED
                 activity?.runOnUiThread {
                     binding.tvSubtitle4.text = getString(R.string.sample_started)
                     binding.btnSamplestart.visibility = View.GONE
                 }
             }
 
-            stringData.contains("#SC") -> {
+            resultData.contains("#SC") && this.testStatusCode < Constants.TEST_STATUS_CODE_SAMPLE_COMPLETED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_SAMPLE_COMPLETED
                 hemoCubeViewModel.messages.postValue(
                     getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data))
                 fetchResult()
                 testingTrace.stop()
             }
 
-            resultData.contains("REND") -> {
+            resultData.contains("REND") && this.testStatusCode < Constants.TEST_STATUS_CODE_SAMPLE_PRINT_COMPLETED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_SAMPLE_PRINT_COMPLETED
                 hemoCubeViewModel.messages.postValue(
                     getString(R.string.data_collected_processing_data)
                 )
@@ -467,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!!)!!
@@ -584,8 +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
+                            )
+                        )
+                    }
                     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)
@@ -611,8 +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
+                            )
+                        )
+                    }
                     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)

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt

@@ -10,45 +10,90 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkManager
 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.datasource.LocalFileDataSource
 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.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.CheckUpdateWorker
+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
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 @HiltViewModel
 class HemoCubeViewModel @Inject constructor(
     private val hemoCubeDao: HemoCubeDao,
     private val repository: Repository,
-    context: Context,
-    private val localFileDataSource: LocalFileDataSource
+    private val databaseRepository: DatabaseRepository,
+    private val logFileManager: LogFileManager,
+    context: Context
 ) : ViewModel() {
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
-    val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
+    private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
     val messages = MutableLiveData<String>()
     private val sharedPreference: SharedPreferences =
         context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
 
+    private val workManager = WorkManager.getInstance(context)
+
+//    init {
+//        startPeriodicCheckUpdate()
+//    }
+
+    val deviceProvisionResponse = MutableLiveData<Result<DeviceProvisionResponse>>()
+
+    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?>()
     val fireBaseUpload = MutableLiveData<String>()
     val fireBaseBulkUpload = MutableLiveData<String>()
 
@@ -58,31 +103,88 @@ class HemoCubeViewModel @Inject constructor(
         }
 
     fun uploadHemoCubeResultToDatabase(
-        isOnline: Boolean,
-        testStatus: Boolean,
-        kitSerial: String?
-    ) =
-        viewModelScope.launch {
-            if (kitSerial != null) {
-                testDetails?.kitSerial = kitSerial
-            }
-            testDetails?.testStatus = testStatus
+        isOnline: Boolean, testStatus: Boolean, kitSerial: String?
+    ) = viewModelScope.launch {
+        if (kitSerial != null) {
+            testDetails?.kitSerial = kitSerial
+        }
+        testDetails?.testStatus = testStatus
 
-            try {
-                if (isOnline) {
-                    parseData()
-                    addResultTestToDb()
-                } else {
-                    parseData()
-                    testDetails?.testTime = getCurrentDate()
-                    hemoCubeDao.insertAll(testDetails!!)
-                    fireBaseUpload.postValue("Local")
+        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 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 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 startPeriodicCheckUpdate() {
+        val periodicRequest = PeriodicWorkRequestBuilder<CheckUpdateWorker>(
+            repeatInterval = 1, repeatIntervalTimeUnit = TimeUnit.MINUTES
+        ).build()
+
+        workManager.enqueueUniquePeriodicWork(
+            "checkUpdateWorker", ExistingPeriodicWorkPolicy.KEEP, periodicRequest
+        )
+    }
+
+    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)
                 }
-            } catch (e: Exception) {
-                Log.e("Testdb", "Upload failed: ${e.message}")
             }
         }
-
+    }
 
     fun uploadHemoCubeResultToDatabaseforbuffercheckN(bufferCheckData: BufferCheckData) =
         viewModelScope.launch {
@@ -97,7 +199,9 @@ class HemoCubeViewModel @Inject constructor(
         testDetails?.deviceRatio = DataHolder.hemocubeResult
         testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
         testDetails?.location = DataHolder.location
-        testDetails?.testTime = getCurrentDate()
+        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 =
@@ -124,21 +228,20 @@ class HemoCubeViewModel @Inject constructor(
         testDetails?.calculatedRatio = DataHolder.hemoCubeTestData?.calculatedRatio
         testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients
         testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
-        testDetails?.prdClassification =
-            DataHolder.hemoCubeTestData?.prdClassification.toString()
+        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?.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 = getCurrentDate()
+                testDetails!!.reportUploadTime = SimpleDateFormat(
+                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                ).format(Calendar.getInstance().time)
 
                 when (val response = repository.addTestToDatabase(testDetails)) {
                     is Response.Success -> {
@@ -150,6 +253,24 @@ class HemoCubeViewModel @Inject constructor(
                         Log.i("Testdb", "Data uploaded to Firestore successfully")
                         fireBaseUpload.postValue("Success")
                         testDetails.localFlag = true
+                        uploadResult(
+                            MolbioV2ResultRequest(
+                                listOf(
+                                    MolbioV2Result(
+                                        rawData = testDetails,
+                                        analysisId = testDetails._id,
+                                        analysisDate = testDetails.testTime,
+                                        analysisStatus = testDetails.classificationResult,
+                                        thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[testDetails.deviceId].toString(),
+                                        interpretation = testDetails.classificationResult,
+                                        testId = testDetails._id,
+                                        testTime = testDetails.testTime,
+                                        collectionTime = testDetails.testTime,
+                                        expiryTime = testDetails.testTime,
+                                    )
+                                )
+                            )
+                        )
                         hemoCubeDao.insertAll(testDetails)
                     }
 
@@ -158,6 +279,8 @@ class HemoCubeViewModel @Inject constructor(
                         fireBaseUpload.postValue("Error")
                         hemoCubeDao.insertAll(testDetails)
                     }
+
+                    else -> {}
                 }
             } catch (e: Exception) {
                 Log.e("Testdb", "Exception during data upload: ${e.message}")
@@ -166,13 +289,11 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
-
     private fun addResultTestToDbforbuffercheck(bufferCheckData: BufferCheckData) {
         viewModelScope.launch {
             try {
 
-                when (val response =
-                    repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
+                when (val response = repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
                     is Response.Success -> {
                         Log.i("Testdb", "Data uploaded to Firestore successfully")
                         fireBaseUpload.postValue("Success")
@@ -182,6 +303,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}")
@@ -192,7 +315,9 @@ class HemoCubeViewModel @Inject constructor(
 
     fun bulkAddResultTestToDb(userData: HemoCubeTestData) {
         viewModelScope.launch {
-            userData.reportUploadTime = getCurrentDate()
+            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")
@@ -210,6 +335,10 @@ class HemoCubeViewModel @Inject constructor(
         hemoCubeDao.updateFieldById(id = userId, true)
     }
 
+    fun updateMolbioFlag(userId: String) = viewModelScope.launch {
+        hemoCubeDao.updateMolbioFlag(id = userId, true)
+    }
+
     fun addUser(userData: HemoCubeTestData) = viewModelScope.launch {
         hemoCubeDao.insertAll(userData)
     }
@@ -248,42 +377,18 @@ class HemoCubeViewModel @Inject constructor(
 
     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
+        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 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
-    }
-
-    fun createCSV(hemoCubeTestData: List<HemoCubeTestData>, appContext: Context) =
-        viewModelScope.launch {
-            val fileName = "HPOS${getCurrentDate()}.csv"
-            if (localFileDataSource.exportDataToCSV(fileName, hemoCubeTestData)) {
-                hemoCubeTestData.forEach { data ->
-                    data.localFlag = true
-                    hemoCubeDao.updateCSVFieldById(
-                        data._id,
-                        true
-                    )
-                }
-            }
-        }
-
-    private fun getCurrentDate(): String {
-        return SimpleDateFormat(
-            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-        ).format(Calendar.getInstance().time)
+        return currentCapacity.toFloat() / designCapacity.toFloat() * 100
     }
 }

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)
+    }
+}

app/src/main/res/drawable/download_csv.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="@color/primary"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/primary" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
-</vector>

app/src/main/res/layout/fragment_hemo_cube_reference.xml

@@ -195,16 +195,31 @@
             style="@style/title1_1"
             android:visibility="gone"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="40dp"
             android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="172dp"
+            android:layout_marginTop="72dp"
             android:gravity="center"
             android:textColor="@color/red"
-            android:textSize="18sp"
+            android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btn_submit" />
 
+        <TextView
+            android:id="@+id/tv_device_messages"
+            style="@style/title1_1"
+            android:visibility="gone"
+            android:layout_width="0dp"
+            android:layout_height="180dp"
+            android:layout_marginHorizontal="24dp"
+            android:layout_marginTop="72dp"
+            android:gravity="center"
+            android:textColor="@color/black"
+            android:textSize="11sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/error_message" />
+
         <Button
             android:visibility="gone"
             android:id="@+id/btn_digitalCard"

app/src/main/res/layout/fragment_home.xml

@@ -18,24 +18,11 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/downloadCSV"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="32dp"
-        android:visibility="gone"
-        android:backgroundTint="@color/primary"
-        android:contentDescription="@string/downloadcsv"
-        android:src="@drawable/download_csv"
-        app:elevation="1dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/internetNotAvailableCL"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
+        android:visibility="visible"
         android:padding="24dp">
 
         <TextView
@@ -44,7 +31,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:layout_marginTop="24dp"
             android:text="@string/internet_not_available_please_enter_the_user_id_manually"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -120,7 +106,7 @@
         android:id="@+id/internetAvailableCL"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="visible"
+        android:visibility="gone"
         android:padding="24dp">
 
         <TextView

app/src/main/res/values-hi/strings.xml

@@ -185,8 +185,6 @@
     <string name="user_id_error_message">उपयोगकर्ता आईडी 18 अंकों की होनी चाहिए और कृपया रक्त समूह का चयन करें</string>
     <string name="upload_db_registration_title">डीबी टेस्ट अपलोड करें</string>
     <string name="upload_db_registration_message">क्या आप स्थानीय डीबी टेस्ट को क्लाउड पर अपलोड करना चाहते हैं?</string>
-    <string name="download_db_registration_title">डाउनलोड डीबी टेस्ट</string>
-    <string name="download_db_registration_message">क्या आप लोकल डीबी टेस्ट्स को सीएसवी प्रारूप में डाउनलोड करना चाहते हैं?</string>
     <string name="upload">अपलोड</string>
     <string name="cancel">रद्द करें</string>
     <string name="upload_success_message">अपलोड सफलता पूर्वक हुआ</string>
@@ -262,5 +260,4 @@
     <string name="app_language">ऐप भाषा</string>
     <string name="add_blood_group">रक्त समूह जोड़ें</string>
     <string name="ok">ठीक है</string>
-    <string name="downloadcsv">सीएसवी डाउनलोड करें</string>
 </resources>

app/src/main/res/values-kn/strings.xml

@@ -184,8 +184,6 @@
     <string name="user_id_error_message">ಬಳಕೆದಾರ ಐಡಿ 18 ಅಂಕಗಳಿರಬೇಕು ಮತ್ತು ದಯವಿಟ್ಟು ರಕ್ತ ಗುಂಪುವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
     <string name="upload_db_registration_title">ಸ್ಥಾನಿಕ DB ಪರೀಕ್ಷೆಗಳನ್ನು ಅಪ್ಲೋಡ್ ಮಾಡಿ</string>
     <string name="upload_db_registration_message">ನೀವು ಸ್ಥಾನಿಕ DB ಪರೀಕ್ಷೆಗಳನ್ನು ಕ್ಲೌಡ್‌ಗೆ ಅಪ್ಲೋಡ್ ಮಾಡಲು ಬಯಸುತ್ತೀರಾ?</string>
-    <string name="download_db_registration_title">ಡೌನ್ಲೋಡ್ ಡಿಬಿ ಟೆಸ್ಟ್‌ಗಳು</string>
-    <string name="download_db_registration_message">ನೀವು ಲೋಕಲ್ ಡಿಬಿ ಟೆಸ್ಟ್‌ಗಳನ್ನು CSV ಆಕರದಲ್ಲಿ ಡೌನ್ಲೋಡ್ ಮಾಡಲು ಬಯಸುತ್ತೀರಾ?</string>
     <string name="upload">ಅಪ್ಲೋಡ್ ಮಾಡಿ</string>
     <string name="cancel">ರದ್ದು ಮಾಡಿ</string>
     <string name="upload_success_message">ಯಶಸ್ವಿಯಾಗಿ ಅಪ್ಲೋಡ್ ಮಾಡಲಾಗಿದೆ</string>
@@ -262,7 +260,6 @@
     <string name="app_language">ಅಪ್ಲಿಕೇಶನ್ ಭಾಷೆ</string>
     <string name="add_blood_group">ರಕ್ತ ಗುಂಡನ್ನು ಸೇರಿಸಿ</string>
     <string name="ok">ಸರಿ</string>
-    <string name="downloadcsv">CSV ಡೌನ್ಲೋಡ್ ಮಾಡಿ</string>
-    <!-- Add translations for other strings -->
+        <!-- Add translations for other strings -->
 
 </resources>

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>
+
 
 
 

app/src/main/res/values/strings.xml

@@ -186,8 +186,6 @@
     <string name="user_id_error_message">User ID should be 18 digits and please select the blood group</string>
     <string name="upload_db_registration_title">Upload DB Tests</string>
     <string name="upload_db_registration_message">Do you want to upload the local DB tests to the cloud?</string>
-    <string name="download_db_registration_title">Download DB Tests</string>
-    <string name="download_db_registration_message">Do you want to download the local DB tests in CSV format?</string>
     <string name="upload">Upload</string>
     <string name="cancel">Cancel</string>
     <string name="upload_success_message">Upload done successfully</string>
@@ -234,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>
@@ -262,5 +261,4 @@
     <string name="select_language">Select your preferred language</string>
     <string name="app_language">App Language</string>
     <string name="ok">OK</string>
-    <string name="downloadcsv">Download CSV</string>
 </resources>

app/src/main/res/xml/device_filter.xml

@@ -9,7 +9,7 @@
 <!--    <usb-device vendor-id="1027" product-id="24592" /> &lt;!&ndash; 0x6010: FT2232H &ndash;&gt;-->
 <!--    <usb-device vendor-id="1027" product-id="24593" /> &lt;!&ndash; 0x6011: FT4232H &ndash;&gt;-->
 <!--    <usb-device vendor-id="1027" product-id="24596" /> &lt;!&ndash; 0x6014: FT232H &ndash;&gt;-->
-    <usb-device vendor-id="1027" product-id="24597" /> <!-- 0x6015: FT230X, FT231X, FT234XD -->
+    <usb-device vendor-id="1027" product-id="24577" /> <!-- 0x6015: FT230X, FT231X, FT234XD -->
     <usb-device vendor-id="6790" product-id="29987" /> <!-- 0x6015: FT230X, FT231X, FT234XD -->
 
     <!-- 0x10C4 / 0xEA??: Silabs CP210x -->