resolve compile errors since merge

Kit check online and offline

See merge request sminnovations/hpos!18

.idea/gradle.xml

@@ -4,7 +4,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">

app/build.gradle

@@ -16,11 +16,11 @@ android {
 
     // prod - production, preprod - preproduction, quality - qc
     defaultConfig {
-        applicationId "in.sminnovations.hpostesting"
+        applicationId "in.sminnovations.hpostesting.quality"
         minSdk 21
         targetSdk 34
-        versionCode 26
-        versionName "2.1.26"
+        versionCode 68
+        versionName "2.1.68"
 
         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.11.0'
+    implementation 'com.google.android.material:material:1.10.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,9 +82,6 @@ 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'
-    implementation 'io.nats:jnats:2.11.2'
-
 
 
     // Testing
@@ -100,13 +97,13 @@ dependencies {
 
 
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
-    implementation 'com.opencsv:opencsv:5.5'
+    implementation 'com.opencsv:opencsv:4.6'
     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.5'
+    implementation 'com.opencsv:opencsv:4.6'
 
     // Barcode scanner
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
@@ -115,17 +112,17 @@ dependencies {
     implementation 'com.google.android.gms:play-services-code-scanner:16.1.0'
 
     //Room
-    implementation "androidx.room:room-ktx:2.6.1"
-    implementation "androidx.room:room-runtime:2.6.1"
-    kapt ("androidx.room:room-compiler:2.6.1")
+    implementation "androidx.room:room-ktx:2.6.0"
+    implementation "androidx.room:room-runtime:2.6.0"
+    kapt ("androidx.room:room-compiler:2.6.0")
 
     //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.6"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.6"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.7.5"
+    implementation "androidx.navigation:navigation-ui-ktx:2.7.5"
 
     //Dagger - Hilt
     implementation "com.google.dagger:hilt-android:2.46"
@@ -135,10 +132,7 @@ dependencies {
     // Retrofit + GSON
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
-    implementation("com.squareup.okhttp3:okhttp:4.9.3")
 
     implementation "androidx.preference:preference-ktx:1.2.1"
-    implementation 'io.nats:jnats:2.11.2'
-    implementation 'com.google.android.play:core:1.10.3'
 
 }

app/src/main/AndroidManifest.xml

@@ -5,8 +5,6 @@
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-
     <uses-permission
         android:name="android.permission.BATTERY_STATS"
         tools:ignore="ProtectedPermissions" />
@@ -64,17 +62,7 @@
             android:exported="false"
             android:label="@string/title_activity_dashboard"
             android:theme="@style/Theme.HPOS.NoActionBar"
-            tools:ignore="AppLinkUrlError,MissingClass">
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="content" />
-                <data android:scheme="file" />
-                <data android:mimeType="application/vnd.android.package-archive" />
-            </intent-filter>
-        </activity>
-
+            tools:ignore="MissingClass" />
 
         <service
             android:name="com.example.hpostesting.presentation.testRight.UsbService"
@@ -126,17 +114,6 @@
             android:screenOrientation="portrait"
             android:stateNotNeeded="true"
             tools:replace="android:screenOrientation" />
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="com.example.hpostesting.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
-
     </application>
 
 </manifest>

app/src/main/assets/app.properties

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

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

@@ -0,0 +1,46 @@
+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

@@ -1,7 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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

@@ -1,39 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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,21 +4,8 @@ object Constants {
     const val ACTION_USB_PERMISSION = "shanmukha.in.sickle_cell.USB_PERMISSION"
     const val HOMOCUBE_USB_PERMISSION = "shanmukha.in.sickle_cell_homocube.USB_PERMISSION"
 
-    const val BASE_URL = "www.google.com"
-
     const val ABHA_APP_PACKAGE = "in.ndhm.phr"
 
-    const val serialNumber = "NKH5555AH"
-    const val deviceTypeName = "HPOS"
-    const val uid = "NKH5555AH"
-    const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
-    const val deviceProvisionPassword = "f2ab0e7f9d69"
-    const val deviceID = "HCV-000-3001"
-    const val devicePassword = "810516d8f4c7"
-
-    const val ACCESS_TOKEN = "accessToken"
-    const val NATS_TOKEN = "natsToken"
-
     const val WRITE_TIMEOUT_MILLIS = 30000   // 30 sec
     const val READ_TIMEOUT_MILLIS = 60000   // 1 min
     const val DELAY_BETWEEN_COMMANDS: Long = 1000
@@ -86,7 +73,17 @@ object Constants {
         "HCV-000-3007",
         "HCV-000-3008",
         "HCV-000-3009",
-        "HCV-000-3010"
+        "HCV-000-3010",
+        "HCV-000-3011",
+        "HCV-000-3012",
+        "HCV-000-3013",
+        "HCV-000-3014",
+        "HCV-000-3015",
+        "HCV-000-3016",
+        "HCV-000-3017",
+        "HCV-000-3018",
+        "HCV-000-3019",
+        "HCV-000-3020"
     )
 
     const val password = "SMI@12345"
@@ -113,7 +110,23 @@ object Constants {
     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
+    const val TEST_STATUS_CODE_FIRST_GAIN_STARTED = 12.0
+    const val TEST_STATUS_CODE_FIRST_GAIN_COMPLETED = 13.0
+    const val TEST_STATUS_CODE_FIRST_GAIN_PRINT_STARTED = 14.0
+    const val TEST_STATUS_CODE_FIRST_GAIN_PRINT_COMPLETED = 15.0
+    const val TEST_STATUS_CODE_SECOND_GAIN_STARTED = 16.0
+    const val TEST_STATUS_CODE_SECOND_GAIN_COMPLETED = 17.0
+    const val TEST_STATUS_CODE_SECOND_GAIN_PRINT_STARTED = 18.0
+    const val TEST_STATUS_CODE_SECOND_GAIN_PRINT_COMPLETED = 19.0
+    const val TEST_STATUS_CODE_THIRD_GAIN_STARTED = 20.0
+    const val TEST_STATUS_CODE_THIRD_GAIN_COMPLETED = 21.0
+    const val TEST_STATUS_CODE_THIRD_GAIN_PRINT_STARTED = 22.0
+    const val TEST_STATUS_CODE_THIRD_GAIN_PRINT_COMPLETED = 23.0
+    const val TEST_STATUS_CODE_FORTH_GAIN_STARTED = 24.0
+    const val TEST_STATUS_CODE_FORTH_GAIN_COMPLETED = 25.0
+    const val TEST_STATUS_CODE_FORTH_GAIN_PRINT_STARTED = 26.0
+    const val TEST_STATUS_CODE_FORTH_GAIN_PRINT_COMPLETED = 27.0
+    const val TEST_STATUS_CODE_TEST_COMPLETED = 30.0
 
     val DEVICE_CONFIGURATION: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
         "HCV-000-3001" to listOf(
@@ -141,21 +154,21 @@ object Constants {
             listOf(1.0, 0.0)                    // LED4
         ),
         "HCV-000-3005" to listOf(
-            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(1.3801, -0.372),             // LED1, 435nm
             listOf(0.581462456, -0.58502),      // LED2, 415nm
-            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(0.4565, -0.0371),            // LED3, 555nm
             listOf(1.0, 0.0)                    // LED4
         ),
         "HCV-000-3006" to listOf(
-            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(1.3801, -0.372),             // LED1, 435nm
             listOf(0.581462456, -0.58502),      // LED2, 415nm
-            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(0.4565, -0.0371),            // LED3, 555nm
             listOf(1.0, 0.0)                    // LED4
         ),
         "HCV-000-3007" to listOf(
-            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(1.8445, -0.8213),            // LED1, 435nm
             listOf(0.581462456, -0.58502),      // LED2, 415nm
-            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(0.4613, -0.0831),            // LED3, 555nm
             listOf(1.0, 0.0)                    // LED4
         ),
         "HCV-000-3008" to listOf(
@@ -176,6 +189,66 @@ object Constants {
             listOf(0.2304, -0.0145),            // LED3, 555nm
             listOf(1.0, 0.0)                    // LED4
         ),
+        "HCV-000-3011" 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-3012" 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-3013" 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-3014" 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-3015" 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-3016" 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-3017" 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-3018" 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-3019" 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-3020" 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
@@ -242,6 +315,66 @@ object Constants {
             listOf(24500, 26250),
             listOf(24500, 26250),
             listOf(24500, 26250),
-        )
+        ),
+        "HCV-000-3011" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3012" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3013" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3014" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3015" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3016" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3017" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3018" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3019" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3020" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
     )
 }

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

@@ -4,6 +4,10 @@ enum class HemoCubeCommands(val command: String) {
     startBuffer("B\r"),
     runDiagnostics("D\r"),
     startSample("S\r"),
-    getSample("P\r"),
+    PRINT_COMMAND("P\r"),
     getDeviceId("I\r"),
+    FIRST_GAIN_COMMAND("T\r"),
+    SECOND_GAIN_COMMAND("U\r"),
+    THIRD_GAIN_COMMAND("V\r"),
+    FORTH_GAIN_COMMAND("W\r"),
 }

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

@@ -0,0 +1,26 @@
+package com.example.hpostesting.data.dao
+
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.example.hpostesting.data.model.patient.BufferCheckData
+
+@Dao
+interface HemoCubeBufferDao {
+    @Query("SELECT * from hemo_cube_buffer_test_table")
+    fun getAll(): LiveData<List<BufferCheckData>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAll(bufferCheckData: BufferCheckData)
+
+    @Query("SELECT * FROM hemo_cube_buffer_test_table WHERE _id = :id")
+    suspend fun getUserByID(id: String): BufferCheckData
+
+    @Query("DELETE FROM hemo_cube_buffer_test_table WHERE _id = :id")
+    suspend fun deleteById(id: String)
+
+    @Query("UPDATE hemo_cube_buffer_test_table SET localFlag = :newValue WHERE _id = :id")
+    suspend fun updateFieldById(id: String, newValue: Boolean)
+}

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

@@ -1,19 +1,17 @@
 package com.example.hpostesting.data.dao
 
-import android.content.Context
 import androidx.room.Database
-import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
+import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.google.android.datatransport.runtime.dagger.Provides
-import javax.inject.Singleton
+import com.example.hpostesting.data.model.patient.UserData
 
-@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 14, exportSchema = false)
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 17, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao
     abstract fun hemoCubeDao(): HemoCubeDao
+    abstract fun hemoCubeBufferDao(): HemoCubeBufferDao
 }

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt

@@ -1,6 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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

@@ -1,9 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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? = "",
-    val version: String? = "2.1.26"
-)

app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt

@@ -1,12 +0,0 @@
-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

@@ -1,38 +0,0 @@
-package com.example.hpostesting.data.model.molbioresult
-
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-
-data class MolbioV2Result(
-    val age: Int? = 0,
-    val analysisDate: String? = "",
-    val analysisId: String? = "",
-    val analysisStatus: String? = "",
-    val analysisType: String? = "",
-    val analysisTypeMethod: String? = "",
-    val bloodGroup: String? = "",
-    val coefficients: List<Int>? = listOf(),
-    val collectionLocation: List<Any>? = listOf(),
-    val collectionTime: String? = "",
-    val collector: String? = "",
-    val curveFitting: String? = "",
-    val deviceName: String? = "",
-    val expiryTime: String? = "",
-    val gender: String? = "",
-    val interpretation: String? = "",
-    val `operator`: String? = "",
-    val patientId: Int? = 0,
-    val pregnancy: Boolean? = false,
-    val rawData: HemoCubeTestData? = HemoCubeTestData(),
-    val recommendation: String? = "",
-    val sampleId: String? = "",
-    val sampleType: String? = "",
-    val sickleCellHistory: Boolean? = false,
-    val testId: String? = "",
-    val testResult: String? = "",
-    val testStatus: String? = "",
-    val testTime: String? = "",
-    val testType: String? = "",
-    val thresholds: String? = "",
-    val underMedication: Boolean? = false,
-    val volume: Int? = 0
-)

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

@@ -1,42 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,55 +0,0 @@
-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/BufferCheckData.kt

@@ -1,21 +1,47 @@
 package com.example.hpostesting.data.model.patient
 
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "hemo_cube_buffer_test_table")
 data class BufferCheckData(
+    @PrimaryKey
+    var _id: String = "",
     var kitno: String = "",
     var deviceId: String? = "",
     var appVersion:String? = "",
     var deviceSerialNumber: String = "",
     var deviceType: String = "HEMOCUBE",
+    var localFlag: Boolean = false,
     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 testTime: String = ""
+    var testTime: String = "",
+    var prdClassification: String = "",
+    var errorMessages: String = "",
+    var batteryLevel: String = "",
+    var batteryCapacity: String = "",
+    var batteryMaxCapacity: String = "",
+    var batteryTemperature: String = "",
+    var batteryVoltage: String = "",
+    var reportUploadTime: String? = "",
 )

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

@@ -43,17 +43,35 @@ data class HemoCubeTestData(
     var abs2: Double? = null,
     var abs3: Double? = null,
     var abs4: Double? = null,
+    var led1Gain1: Double? = null,
+    var led2Gain1: Double? = null,
+    var led3Gain1: Double? = null,
+    var led4Gain1: Double? = null,
+    var led1Gain2: Double? = null,
+    var led2Gain2: Double? = null,
+    var led3Gain2: Double? = null,
+    var led4Gain2: Double? = null,
+    var led1Gain3: Double? = null,
+    var led2Gain3: Double? = null,
+    var led3Gain3: Double? = null,
+    var led4Gain3: Double? = null,
+    var led1Gain4: Double? = null,
+    var led2Gain4: Double? = null,
+    var led3Gain4: Double? = null,
+    var led4Gain4: Double? = null,
     var deviceRatio: Double? = null,
     var calculatedRatio: Double? = null,
     var predictedDenovixRatio: Double? = null,
+    var slopeRatio: Double? = null,
     var coefficients: String? = "",
     var classificationResult: String = "",
     var prdClassification: String = "",
+    var deviceRatioClass: String = "",
+    var slopeRatioClass: String = "",
     var errorMessages: String = "",
     var batteryLevel: String = "",
     var batteryCapacity: String = "",
     var batteryMaxCapacity: String = "",
     var batteryTemperature: String = "",
     var batteryVoltage: String = "",
-    var molbioFlag: Boolean = false
 )

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

@@ -0,0 +1,55 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -1,5 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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,97 +1,37 @@
 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 NetworkException(message: String, cause: Throwable) : Exception(message, cause)
-class DatabaseRepository @Inject constructor(
-    @Named("Auth")private val molbioAuthApi: MolbioAuthApi,
-    private val molbioResultApi: MolbioResultApi
-) : Repository {
+class DatabaseRepository @Inject constructor() : 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)
         }
@@ -99,15 +39,14 @@ class DatabaseRepository @Inject constructor(
 
     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)
@@ -117,7 +56,7 @@ class DatabaseRepository @Inject constructor(
     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)
@@ -127,16 +66,14 @@ class DatabaseRepository @Inject constructor(
     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

@@ -1,23 +0,0 @@
-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/LogFileManager.kt

@@ -1,38 +0,0 @@
-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,12 +2,8 @@ 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.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
 import com.example.hpostesting.data.dao.UserDao
@@ -15,21 +11,13 @@ 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
@@ -41,7 +29,9 @@ object AppModule {
     fun provideMyDatabase(@ApplicationContext context: Context): MyDatabase {
         return Room.databaseBuilder(
             context, MyDatabase::class.java, "my_database"
-        ).fallbackToDestructiveMigration().build()
+        )
+            .fallbackToDestructiveMigration()
+            .build()
     }
 
     @Provides
@@ -55,6 +45,12 @@ object AppModule {
     fun provideMyHemo(myDatabase: MyDatabase): HemoCubeDao {
         return myDatabase.hemoCubeDao()
     }
+    @Provides
+    @Singleton
+    fun provideMyHemoCubeBuffer(myDatabase: MyDatabase): HemoCubeBufferDao {
+        return myDatabase.hemoCubeBufferDao()
+    }
+
 
     @Provides
     @Singleton
@@ -78,89 +74,13 @@ object AppModule {
 
     @Provides
     @Singleton
-    fun provideDatabaseRepository(
-        @Named("Auth") molbioAuthApi: MolbioAuthApi,
-        molbioResultApi: MolbioResultApi
-    ): DatabaseRepository {
-        return DatabaseRepository(molbioAuthApi = molbioAuthApi, molbioResultApi = molbioResultApi)
+    fun provideDatabaseRepository(): DatabaseRepository {
+        return DatabaseRepository()
     }
 
     @Provides
     @Singleton
-    fun provideRepository(
-        @Named("Auth") molbioAuthApi: MolbioAuthApi,
-        molbioResultApi: MolbioResultApi
-    ): Repository {
-        return DatabaseRepository(molbioAuthApi, molbioResultApi)
+    fun provideRepository(): Repository {
+        return DatabaseRepository()
     }
-
-    @Provides
-    @Singleton
-    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,7 +104,6 @@ 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

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

@@ -64,7 +64,7 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
                 if (batLevel < 40) {
                     Toast.makeText(
                         view.context,
-                        view.context.getString(R.string.low_battery_warning),
+                        context?.getString(R.string.low_battery_warning),
                         Toast.LENGTH_SHORT
                     ).show()
                     return@setOnClickListener
@@ -73,7 +73,7 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
                     if (userList.testStatus!!) {
                         Toast.makeText(
                             view.context,
-                            view.context.getString(R.string.test_already_conducted),
+                            context?.getString(R.string.test_already_conducted),
                             Toast.LENGTH_SHORT
                         ).show()
                     } else {
@@ -81,14 +81,13 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
                             if (isBetween15And30Minutes(userList.incubationTime) < Constants.INCUBATION_TIME_MIN) {
                                 Toast.makeText(
                                     view.context,
-                                    view.context.getString(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) {
+                            } else if (isBetween15And30Minutes(userList.incubationTime) > Constants.INCUBATION_TIME_MAX) {
                                 Toast.makeText(
                                     view.context,
-                                    view.context.getString(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,
-                                view.context.getString(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

@@ -197,7 +197,7 @@ class UserListAdapter(
 //                    }
             }
             userCard.setOnClickListener {
-                if (false) {
+                if (batLevel < Constants.BATTERY_LEVEL_MIN) {
                     Toast.makeText(
                         view.context,
                         context?.getString(R.string.low_battery_warning),
@@ -214,13 +214,13 @@ class UserListAdapter(
                         ).show()
                     } else {
                         if (model.incubationTime != "") {
-                            if (isBetween15And30Minutes(model.incubationTime) < 15) {
+                            if (isBetween15And30Minutes(model.incubationTime) < -15000) {
                                 Toast.makeText(
                                     view.context,
                                     context?.getString(R.string.incubation_not_completed),
                                     Toast.LENGTH_SHORT
                                 ).show()
-                            } else if (isBetween15And30Minutes(model.incubationTime) > 30) {
+                            } else if (isBetween15And30Minutes(model.incubationTime) > 300000) {
                                 Toast.makeText(
                                     view.context,
                                     context?.getString(R.string.incubation_crossed_30_minutes),

app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt

@@ -1,36 +1,30 @@
 package com.example.hpostesting.presentation.buffercheck
 
 import android.content.Context
-import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
 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.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.presentation.UsbServiceListener
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.utils.MyDialogListener
-import com.example.hpostesting.presentation.utils.UIUtils
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
-import kotlin.math.log10
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
+import java.util.UUID
+import kotlin.math.log10
 
 class HemoCubeBufferCheckFragment : Fragment() {
 
@@ -41,9 +35,24 @@ class HemoCubeBufferCheckFragment : Fragment() {
     private var resultData: String = ""
     private var kitno: String = ""
     private var isOnline = false
-    private val messages = MutableLiveData<String>()
     private var isTestOngoing = false
     private var startListening = MutableLiveData(false)
+    private var led1BufferForDevice = 0.0
+    private var led2BufferForDevice = 0.0
+    private var led3BufferForDevice = 0.0
+    private var led4BufferForDevice = 0.0
+    private var led1SampleForDevice = 0.0
+    private var led2SampleForDevice = 0.0
+    private var led3SampleForDevice = 0.0
+    private var led4SampleForDevice = 0.0
+    private var fittedAbs1 = 0.0
+    private var fittedAbs2 = 0.0
+    private var fittedAbs3 = 0.0
+    private var fittedAbs4 = 0.0
+    private var _predictedDenovixRatio = 0.0
+    private var validationError = false
+    private var allErrorMessages = ""
+    private var deviceHardwareId = ""
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
     ): View {
@@ -64,13 +73,14 @@ class HemoCubeBufferCheckFragment : Fragment() {
         binding.nameEditText.setText("SMI/SC/")
         binding.tvTitle.visibility = View.GONE
         binding.tvName.visibility = View.GONE
+        binding.btnPlacebuffer.visibility = View.GONE
 
         binding.btnGo.setOnClickListener {
             val serialNumber = binding.nameEditText.text.toString().trim()
             if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
                 kitno = serialNumber
                 listenToHemoCube()
-                startBufferProcess()
+                getDeviceInfo()
             } else {
                 Toast.makeText(context, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
                 return@setOnClickListener
@@ -84,17 +94,17 @@ class HemoCubeBufferCheckFragment : Fragment() {
             }
         }
 
-
-
-        activity?.runOnUiThread {
-            binding.btnSubmit.isEnabled = true
-            binding.btnSubmit.isClickable = true
-        }
-        binding.btnSubmit.setOnClickListener {
-
+        binding.btnSamplestart.setOnClickListener {
+            startSampleProcess()
+            it.visibility = View.GONE
         }
         binding.btnSubmit.isEnabled = false
         binding.btnSubmit.isClickable = false
+
+        binding.btnPlacebuffer.setOnClickListener {
+            checkAndStartProcess()
+            it.visibility = View.GONE
+        }
     }
 
     private fun observeViewModel() {
@@ -116,6 +126,10 @@ class HemoCubeBufferCheckFragment : Fragment() {
             if (result == "Success") {
                 showToast(R.string.kit_uploaded)
             }
+            if (result == "Error") {
+                showToast("Error uploading data, Kit result stored locally")
+                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
+            }
             if (result == "Local") {
                 showToast(R.string.kit_upload_failed)
             }
@@ -123,27 +137,24 @@ class HemoCubeBufferCheckFragment : Fragment() {
             binding.progressBar.visibility = View.GONE
         }
 
-        messages.observe(viewLifecycleOwner) {
+        hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
         }
     }
 
+    private fun checkAndStartProcess() {
+        startBufferProcess()
+    }
+
     private fun listenToHemoCube() {
-        if (DataHolder.hemoCubeTestData == null) {
-            DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData()
-        }
-
-        val fullReadOutput = StringBuilder()
         startListening.postValue(true)
-
         try {
             (activity as HemocubeBufferCheckActivity).mService.listenToHemoCube(object :
                 UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
                         val stringData = String(it)
-                        fullReadOutput.append(stringData)
-                        handleUsbData(stringData, fullReadOutput)
+                        handleUsbData(stringData)
                     }
                 }
 
@@ -156,97 +167,212 @@ class HemoCubeBufferCheckFragment : Fragment() {
         }
     }
 
-    private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
+    private fun handleUsbData(stringData: String) {
         if (stringData.contains("#")) {
-            messages.postValue(stringData)
             isTestOngoing = true
         }
 
-        resultData += fullReadOutput.toString()
+        resultData += stringData
 
         when {
-            stringData.contains("#Buffer Completed") -> showStartSampleDialog()
-            stringData.contains("#Sample Completed") -> {
-                activity?.runOnUiThread {
-                    binding.btnSubmit.isEnabled = true
-                    binding.btnSubmit.isClickable = true
+            stringData.contains("SN") -> {
+                val slData = stringData.split(" ")
+                if (slData.size > 1) {
+                    val hardwareId = slData[1].trim()
+                    deviceHardwareId = hardwareId
+                    with(sharedPreferences.edit()) {
+                        putString(Constants.DEVICE_ID, hardwareId)
+                        apply()
+                    }
                 }
+                activity?.runOnUiThread {
+                    binding.tvSubtitle4.visibility = View.VISIBLE
+                    binding.btnPlacebuffer.visibility = View.VISIBLE
+                }
+                hemoCubeViewModel.messages.postValue("Start")
+            }
+
+            stringData.contains("#BS") -> {
+                hemoCubeViewModel.messages.postValue("Buffer Started")
+            }
+
+            stringData.contains("#BC") -> {
+                activity?.runOnUiThread {
+                    binding.tvSubtitle4.text = "Buffer Completed"
+                    binding.btnSamplestart.visibility = View.VISIBLE
+                }
+            }
+
+            stringData.contains("#SS") -> {
+                activity?.runOnUiThread {
+                    binding.tvSubtitle4.text = "Sample Started"
+                    binding.btnSamplestart.visibility = View.GONE
+                }
+            }
+
+            stringData.contains("#SC") -> {
+                hemoCubeViewModel.messages.postValue("Sample Completed \nGathering data")
                 fetchResult()
             }
 
-            stringData.contains("RESULT") || resultData.contains("REND") -> {
-                var validString: String
-                val results: List<String>
-                if (stringData.contains("RESULT")) {
-                    validString = isValidResult(stringData)
-                    if (validString.isEmpty()) {
-                        results = resultData.split("\n")
-                        validString = parseResult(results)
-                    }
-                } else {
-                    results = resultData.split("\n")
-                    validString = parseResult(results)
-                }
-                if (validString.isNotEmpty()) {
-                    handleValidResult(validString)
-                }
-            }
-        }
-    }
-
-    private fun showStartSampleDialog() {
-        activity?.runOnUiThread {
-            UIUtils.createAlertDialog(requireContext(),
-                "Start Sample",
-                "Do you want to start sample reading?",
-                getString(R.string.no),
-                "Yes",
-                object : MyDialogListener {
-                    override fun onClickNegativeButton() {}
-
-                    override fun onClickPositiveButton() {
-                        listenToHemoCube()
-                        startSampleProcess()
-                    }
-                })
-        }
-    }
-
-    private fun handleValidResult(validString: String) {
-        try {
-            val result = validString.split(" ")
-            if (result.size == 8) {
-                val deviceId = result[2]
-                val led1BufferForDevice = result[3].toDoubleOrNull()
-                val led2BufferForDevice = result[4].toDoubleOrNull()
-                val led1Sample = result[5].toDoubleOrNull()
-                val led2Sample = result[6].toDoubleOrNull()
-                val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0)
-                val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0)
-                val deviceRatio = led1Average / led2Average
-                val calculateRatio = calculateRatio(deviceRatio)
-                val classificationResult = findResult(calculateRatio)
-                messages.postValue(classificationResult)
-                val bufferData = BufferCheckData(
-                    deviceId= deviceId,
-                    kitno = kitno,
-                    led1Buffer = led1BufferForDevice,
-                    led2Buffer = led2BufferForDevice,
-                    led1Average = led1Average,
-                    led2Average = led2Average,
-                    led1Sample = led1Sample,
-                    led2Sample = led2Sample,
-                    deviceRatio = deviceRatio,
-                    calculatedRatio = calculateRatio,
-                    coefficients = currentDeviceData?.coefficients?.get(0).toString() + ", " + currentDeviceData?.coefficients?.get(1).toString(),
-                    classificationResult = classificationResult,
-                    deviceSerialNumber = sharedPreferences.getString(Constants.USER_ID, "").toString(),
-                    testTime = SimpleDateFormat(
-                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                    ).format(Calendar.getInstance().time)
+            resultData.contains("REND") -> {
+                hemoCubeViewModel.messages.postValue(
+                    "Data collected \n" + " Processing data"
                 )
-                hemoCubeViewModel.uploadHemoCubeResultToDatabaseforbuffercheckN(bufferData)
+                val resultLines = resultData.split("\\s+(?=LB|LS)".toRegex())
+                var bufferIntensity = resultLines[1].split(' ')[1].trim()
+                led1BufferForDevice = bufferIntensity.toDoubleOrNull()!!
+                bufferIntensity = resultLines[2].split(' ')[1].trim()
+                led2BufferForDevice = bufferIntensity.toDoubleOrNull()!!
+                bufferIntensity = resultLines[3].split(' ')[1].trim()
+                led3BufferForDevice = bufferIntensity.toDoubleOrNull()!!
+                bufferIntensity = resultLines[4].split(' ')[1].trim()
+                led4BufferForDevice = bufferIntensity.toDoubleOrNull()!!
+                led1SampleForDevice = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
+                led2SampleForDevice = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
+                led3SampleForDevice = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
+                led4SampleForDevice =
+                    resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
+                processResult()
             }
+        }
+    }
+
+    private fun processResult() {
+        try {
+            hemoCubeViewModel.messages.postValue("processing result")
+            val deviceLog = resultData
+
+            val pInfo = requireActivity().packageManager.getPackageInfo(
+                requireActivity().packageName, 0
+            )
+            val version = pInfo.versionName
+
+            val led1Average = log10(led1BufferForDevice.div(led1SampleForDevice))
+            val led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
+            val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
+            val led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
+            val deviceRatio = led3Average / led1Average
+
+            if (led1BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
+                    ?.get(0)!! || led2BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
+                    1
+                )
+                    ?.get(0)!! || led3BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
+                    2
+                )
+                    ?.get(0)!! || led4BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
+                    3
+                )?.get(0)!!
+            ) {
+                validationError = true
+                allErrorMessages += "Error: Invalid Test. Improper buffer reading (low)"
+                activity?.runOnUiThread {
+                    binding.errorMessage.text =
+                        "Error: Invalid Test. Improper buffer reading (low)" + "\n"
+                    binding.errorMessage.visibility = View.VISIBLE
+                }
+            }
+
+            if (led1BufferForDevice > Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
+                    ?.get(1)!! || led2BufferForDevice > Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
+                    1
+                )
+                    ?.get(1)!! || led3BufferForDevice > Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
+                    2
+                )
+                    ?.get(1)!! || led4BufferForDevice > Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
+                    3
+                )?.get(1)!!
+            ) {
+                validationError = true
+                allErrorMessages += "Error: Invalid Test. Improper buffer reading (high)" + "\n"
+                activity?.runOnUiThread {
+                    binding.errorMessage.text =
+                        "Error: Invalid Test. Improper buffer reading (high)"
+                    binding.errorMessage.visibility = View.VISIBLE
+                }
+            }
+
+            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!!)!!
+
+            gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(1)?.get(0)
+            constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(1)?.get(1)
+            fittedAbs2 = gradient?.times(led2Average)?.plus(constant!!)!!
+
+            gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(2)?.get(0)
+            constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(2)?.get(1)
+            fittedAbs3 = gradient?.times(led3Average)?.plus(constant!!)!!
+
+            gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(3)?.get(0)
+            constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(3)?.get(1)
+            fittedAbs4 = gradient?.times(led4Average)?.plus(constant!!)!!
+
+            _predictedDenovixRatio = fittedAbs3.div(fittedAbs1)
+
+            if (fittedAbs1 <= fittedAbs2) {
+                validationError = true
+                allErrorMessages += "Error: Invalid Test. Problem with de-oxygenation" + "\n"
+                activity?.runOnUiThread {
+                    binding.errorMessage.text = "Error: Invalid Test. Problem with de-oxygenation"
+                    binding.errorMessage.visibility = View.VISIBLE
+                }
+            }
+
+            if (fittedAbs1 < 0 || fittedAbs2 < 0 || fittedAbs3 < 0 || fittedAbs4 < 0) {
+                validationError = true
+                activity?.runOnUiThread {
+                    binding.errorMessage.text = "Error: Negative Abs. Redo Kit check Reading"
+                    binding.errorMessage.visibility = View.VISIBLE
+                }
+            }
+
+            val prdClassification = absorbanceBasedClassification(_predictedDenovixRatio)
+            hemoCubeViewModel.messages.postValue(prdClassification)
+
+            val bufferData = BufferCheckData(
+                _id = UUID.randomUUID().toString(),
+                deviceId = deviceHardwareId,
+                kitno = kitno,
+                appVersion = version,
+                led1Buffer = led1BufferForDevice,
+                led2Buffer = led2BufferForDevice,
+                led3Buffer = led3BufferForDevice,
+                led4Buffer = led4BufferForDevice,
+                led1Sample = led1SampleForDevice,
+                led2Sample = led2SampleForDevice,
+                led3Sample = led3SampleForDevice,
+                led4Sample = led4SampleForDevice,
+                led1Average = led1Average,
+                led2Average = led2Average,
+                led3Average = led3Average,
+                led4Average = led4Average,
+                abs1 = fittedAbs1,
+                abs2 = fittedAbs2,
+                abs3 = fittedAbs3,
+                abs4 = fittedAbs4,
+                deviceRatio = deviceRatio,
+                resultData = deviceLog,
+                predictedDenovixRatio = _predictedDenovixRatio,
+                prdClassification = prdClassification,
+                errorMessages = allErrorMessages,
+                coefficients = currentDeviceData?.coefficients?.get(0)
+                    .toString() + ", " + currentDeviceData?.coefficients?.get(1).toString(),
+                deviceSerialNumber = sharedPreferences.getString(Constants.USER_ID, "").toString(),
+                testTime = SimpleDateFormat(
+                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                ).format(Calendar.getInstance().time),
+                batteryLevel = hemoCubeViewModel.getBatteryLevel().toString(),
+                batteryCapacity = hemoCubeViewModel.getBatteryCapacity(requireContext()).toString(),
+                batteryMaxCapacity = hemoCubeViewModel.getBatteryMaxCapacity(requireContext())
+                    .toString(),
+                batteryTemperature = hemoCubeViewModel.getBatteryTemperature().toString(),
+                batteryVoltage = hemoCubeViewModel.getBatteryVoltage(requireContext()).toString()
+            )
+
+            hemoCubeViewModel.uploadHemoCubeResultToDatabaseForBufferCheck(isOnline, bufferData)
         } catch (e: Exception) {
             Toast.makeText(
                 requireContext(), "Error while processing device data", Toast.LENGTH_SHORT
@@ -257,23 +383,44 @@ class HemoCubeBufferCheckFragment : Fragment() {
 
     private fun findResult(calculatedRatio: Double?): String {
         try {
+            hemoCubeViewModel.messages.postValue("result classification")
             if (calculatedRatio != null) {
-                if (calculatedRatio < 0.085) return "Kit Failed"
-                if (calculatedRatio in 0.085..0.155) return "Kit Passed"
-                if (calculatedRatio in 0.155..0.175) return "Kit Failed"
-                if (calculatedRatio in 0.175..0.22) return "Kit Failed"
-                if (calculatedRatio in 0.22..0.25) return "Kit Failed"
-                if (calculatedRatio in 0.25..0.35) return "Kit Failed"
-                if (calculatedRatio > 0.35) return "Kit Failed"
+                if (calculatedRatio < 0.05) return "Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume"
+                if (calculatedRatio in 0.05..0.155) return "Normal"
+                if (calculatedRatio in 0.155..0.175) return "Negative Borderline. Repeat Test"
+                if (calculatedRatio in 0.175..0.22) return "Sickle Cell Trait"
+                if (calculatedRatio in 0.22..0.25) return "Positive for Sickle Cell. HPLC for Confirmation"
+                if (calculatedRatio in 0.25..0.35) return "Sickle Cell Disease"
+                if (calculatedRatio > 0.35) return "Inconclusive. Repeat with test with lower volume of blood"
             } else {
-                return "NULL"
+                return "INVALID"
             }
         } catch (e: Exception) {
             showToast(R.string.error_classification)
             Firebase.crashlytics.recordException(e)
             return "ERROR"
         }
-        return "NULL"
+        return "INVALID"
+    }
+
+    private fun absorbanceBasedClassification(predictedDenovixRatio: Double?): String {
+        try {
+            hemoCubeViewModel.messages.postValue("result classification")
+            if (predictedDenovixRatio != null) {
+                if (predictedDenovixRatio in 0.0..0.16) return "Kit Passed"
+                if (predictedDenovixRatio in 0.16..0.165) return "Kit Passed"
+                if (predictedDenovixRatio in 0.165..0.235) return "Kit Failed"
+                if (predictedDenovixRatio in 0.235..0.24) return "Kit Failed"
+                if (predictedDenovixRatio in 0.24..1.0) return "Kit Failed"
+            } else {
+                return "INVALID"
+            }
+        } catch (e: Exception) {
+            showToast("error while performing classification")
+            Firebase.crashlytics.recordException(e)
+            return "ERROR"
+        }
+        return "INVALID"
     }
 
     private fun showToast(messageResId: Int) {
@@ -282,6 +429,9 @@ class HemoCubeBufferCheckFragment : Fragment() {
 
 
     private fun startBufferProcess() {
+        activity?.runOnUiThread {
+            binding.btnPlacebuffer.visibility = View.GONE
+        }
 
         (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startBuffer,
             object : UsbServiceListener {
@@ -293,6 +443,9 @@ class HemoCubeBufferCheckFragment : Fragment() {
     }
 
     private fun startSampleProcess() {
+        activity?.runOnUiThread {
+            binding.btnPlacebuffer.visibility = View.GONE
+        }
 
         (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startSample,
             object : UsbServiceListener {
@@ -303,9 +456,28 @@ class HemoCubeBufferCheckFragment : Fragment() {
             })
     }
 
+    private fun getDeviceInfo() {
+        hemoCubeViewModel.progressBar.postValue(true)
+        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(
+            HemoCubeCommands.getDeviceId,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {
+                    data?.let {
+                        val stringData = String(it)
+                        hemoCubeViewModel.messages.postValue(stringData)
+                        binding.tvSubtitle4.text = stringData
+                    }
+                }
+
+                override fun onUsbError(e: Exception?) {
+                    hemoCubeViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+
     private fun fetchResult() {
 
-        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.getSample,
+        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.PRINT_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
 
@@ -320,21 +492,6 @@ class HemoCubeBufferCheckFragment : Fragment() {
         return coefficient1 * ratio + coefficient2
     }
 
-    private fun parseResult(frames: List<String>): String {
-        val lines = mutableListOf<String>()
-        for (frame in frames.reversed()) {
-            if (frame.contains("REND") || frame.contains("RESULT")) lines += frame
-            if (frame.contains("RESULT")) {
-                break
-            }
-        }
-        val line = lines.reversed().joinToString("").trim()
-        if (line.contains("RESULT") && line.split(" ").size == 8) {
-            return line
-        }
-        return ""
-    }
-
     private fun isSerialValid(s: String): Boolean {
         if (s.length != 17) {
             binding.nameEditText.error = getString(R.string.invalid_kit)
@@ -342,13 +499,4 @@ class HemoCubeBufferCheckFragment : Fragment() {
         }
         return true
     }
-
-
-    private fun isValidResult(line: String): String {
-        return if (line.contains("RESULT") && line.split(" ").size == 8) {
-            line
-        } else {
-            ""
-        }
-    }
 }

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

@@ -1,46 +1,30 @@
 package com.example.hpostesting.presentation.dashboard
 
-import android.app.DownloadManager
-import android.content.BroadcastReceiver
 import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 import android.view.Menu
 import android.widget.Toast
-import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.FileProvider
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.google.android.material.navigation.NavigationView
-
 import com.google.firebase.appdistribution.FirebaseAppDistribution
 import com.google.firebase.appdistribution.FirebaseAppDistributionException
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
-import okhttp3.ResponseBody
-
-import java.io.File
 
 @AndroidEntryPoint
 class DashboardActivity : AppCompatActivity() {
 
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityDashboardBinding
-    private var downloadId: Long = 0
-    private val hemocubeViewModel: HemoCubeViewModel by viewModels()
 
     override fun attachBaseContext(newBase: Context?) {
         val languageCode = LanguageManager.getSavedLanguage(newBase!!)
@@ -55,41 +39,6 @@ class DashboardActivity : AppCompatActivity() {
         setContentView(binding.root)
         setSupportActionBar(binding.appBarDashboard.toolbar)
 
-        hemocubeViewModel.deviceUpdate.observe(this) { result ->
-            when (result) {
-                is Result.Success -> {
-//                    val apkUrl = result.data
-                    val apkUrl = "https://dl.dropboxusercontent.com/s/fi/1c3nn7t0co431hicl3hrt/app-debug.apk?rlkey=e4uf13ty1dpcked614vy1aaqp&dl=0"
-                    initiateUpdate(apkUrl.toString())
-                    Log.d("ApI", "APK URL For App Update: $apkUrl")
-                    Toast.makeText(
-                        this,
-                        "APK UPLOAD ${result.data}",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    // The APK URL LiveData will be updated automatically
-                }
-
-                is Result.Error -> {
-                        result.exception.let { message ->
-                            Toast.makeText(this, "An error occurred On Updating App: $message", Toast.LENGTH_LONG)
-                                .show()
-
-                    }
-
-                }
-
-                is Result.Loading -> {
-
-                }
-
-                else -> {
-
-                }
-            }
-        }
-
-
         val drawerLayout: DrawerLayout = binding.drawerLayout
         val navView: NavigationView = binding.navView
         val navController = findNavController(R.id.nav_host_fragment_content_dashboard)
@@ -102,8 +51,6 @@ class DashboardActivity : AppCompatActivity() {
         setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
 
-
-
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -117,82 +64,6 @@ class DashboardActivity : AppCompatActivity() {
         return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
     }
 
-    private fun initiateUpdate(responseBody: String) {
-        // Extract the URL from the ResponseBody
-        val apkUrl = responseBody
-
-        // Check if the extracted APK URL is valid
-        if (!isValidHttpUrl(apkUrl)) {
-            // Handle the case where the URL is not valid
-            return
-        }
-
-        val request = DownloadManager.Request(Uri.parse(apkUrl))
-        request.setTitle("App Update")
-        request.setDescription("Downloading update...")
-        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-        request.setDestinationInExternalFilesDir(this, "Updates", "update.apk")
-
-        val downloadManager = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        downloadId = downloadManager.enqueue(request)
-
-        // Register a BroadcastReceiver to receive the download complete event
-        val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
-        registerReceiver(downloadReceiver, filter)
-    }
-
-    // Function to check if a URL has a valid HTTP/HTTPS scheme
-    // Function to extract the APK URL from the ResponseBody
-    private fun extractApkUrl(responseBody: ResponseBody): String {
-        // Assuming your ResponseBody contains the APK URL as a string
-        return responseBody.string()
-    }
-
-    // Function to check if a URL has a valid HTTP/HTTPS scheme
-    private fun isValidHttpUrl(url: String): Boolean {
-        return url.startsWith("http://") || url.startsWith("https://")
-    }
-    private val downloadReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent?) {
-            val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
-            if (id == downloadId) {
-                // Install the downloaded APK
-                installApk()
-            }
-        }
-    }
-
-    private fun installApk() {
-        val file = File(getExternalFilesDir("Updates"), "update.apk")
-        file.setReadable(true, false) // Ensure the file is readable
-
-        val uri: Uri = FileProvider.getUriForFile(
-            this,
-            "com.example.hpostesting.fileprovider",
-            file
-        )
-
-        // Create an intent to install the APK
-        val installIntent = Intent(Intent.ACTION_INSTALL_PACKAGE)
-        installIntent.data = uri
-        installIntent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                Intent.FLAG_ACTIVITY_NEW_TASK or
-                Intent.FLAG_ACTIVITY_CLEAR_TOP
-        installIntent.putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true)
-
-        // Start the installation
-        startActivity(installIntent)
-
-        Log.d("InstallApk", "Install Intent URI: $uri")
-        Log.d("InstallApk", "Package Name: $packageName")
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        unregisterReceiver(downloadReceiver)
-    }
-
-
     override fun onResume() {
         super.onResume()
 
@@ -232,7 +103,4 @@ class DashboardActivity : AppCompatActivity() {
 //                Toast.makeText(this, "App Update: Success!", Toast.LENGTH_SHORT).show()
             }
     }
-
-
-
 }

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

@@ -8,7 +8,6 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.os.BatteryManager
 import android.os.Bundle
-import android.util.Base64
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,14 +16,9 @@ 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.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.presentation.KitScanActivity
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
 import com.example.hpostesting.presentation.adapter.UserListAdapter
@@ -39,7 +33,6 @@ 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
@@ -52,7 +45,6 @@ class HomeFragment : Fragment() {
     private val viewModel: TestRightViewModel by activityViewModels()
     private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
     private lateinit var rvAdapter: UserListAdapter
-    private lateinit var sharedPreferences: SharedPreferences
     private var batLevel: Int =
         0 // Initialize with a default value, or obtain the actual battery level
     private lateinit var adapter: OfflineUserListAdapter
@@ -106,7 +98,6 @@ class HomeFragment : Fragment() {
                 loadUserData()
                 setSearch()
                 checkForLocalDBData()
-                checkForTokenAndUpdate()
             } else {
                 binding.internetAvailableCL.visibility = View.GONE
                 binding.internetNotAvailableCL.visibility = View.VISIBLE
@@ -116,7 +107,9 @@ class HomeFragment : Fragment() {
         hemoCubeViewModel.fireBaseBulkUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 Toast.makeText(
-                    requireContext(), R.string.test_upload, Toast.LENGTH_SHORT
+                    requireContext(),
+                    R.string.test_upload,
+                    Toast.LENGTH_SHORT
                 ).show()
             }
             if (result == "Error") {
@@ -141,137 +134,6 @@ class HomeFragment : Fragment() {
         }
     }
 
-    private fun checkForTokenAndUpdate() {
-        val accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
-        val natsToken = sharedPreference.getString(Constants.NATS_TOKEN, "").toString()
-        if (accessToken.isEmpty() && natsToken.isEmpty()) {
-            hemoCubeViewModel.login(createLoginRequestData())
-        } else {
-            if (isTokenExpired(accessToken)) {
-                hemoCubeViewModel.login(createLoginRequestData())
-            } else {
-                hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
-                hemoCubeViewModel.uploadLogs()
-                hemoCubeViewModel.deviceUpdate(createDeviceRequestData())
-            }
-        }
-        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.DEVICE_ID, response.data.data?.deviceUser?.deviceId?.toString())
-
-            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 createDeviceRequestData(): DeviceUpdateRequest {
-        return DeviceUpdateRequest(
-            serial_no = Constants.DEVICE_ID
-
-        )
-    }
-
     private fun setUserId() {
         binding.btnSubmit.setOnClickListener {
             val userId = binding.userId.text.toString()
@@ -279,9 +141,7 @@ class HomeFragment : Fragment() {
             if (userId.length >= 18 && !bloodGroup.equals("Select Blood Group") || !bloodGroup.isNullOrBlank()) {
                 hemoCubeViewModel.addUser(
                     HemoCubeTestData(
-                        _id = userId,
-                        bloodGroup = bloodGroup.toString(),
-                        incubationTime = SimpleDateFormat(
+                        _id = userId, bloodGroup = bloodGroup.toString(), incubationTime = SimpleDateFormat(
                             "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                         ).format(Calendar.getInstance().time).toString()
                     )
@@ -322,12 +182,8 @@ class HomeFragment : Fragment() {
 
             rvAdapter = view?.let {
                 UserListAdapter(
-                    requireContext(),
-                    hemoCubeViewModel,
-                    recyclerViewOptions,
-                    it,
-                    batLevel,
-                    requireActivity()
+                    requireContext(), hemoCubeViewModel, recyclerViewOptions,
+                    it, batLevel, requireActivity()
                 )
             }!!
             binding.rvOrder.adapter = rvAdapter
@@ -452,7 +308,13 @@ class HomeFragment : Fragment() {
 
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             val uploadDataVisibility =
-                if (userDataList.any { !it.localFlag && it.testStatus == true }) View.VISIBLE else View.GONE
+                if (userDataList.any { !it.localFlag && it.testStatus == true}) View.VISIBLE else View.GONE
+            binding.uploadData.visibility = uploadDataVisibility
+        }
+
+        hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) {bufferData ->
+            val uploadDataVisibility =
+                if (bufferData.any { !it.localFlag}) View.VISIBLE else View.GONE
             binding.uploadData.visibility = uploadDataVisibility
         }
     }
@@ -499,6 +361,16 @@ class HomeFragment : Fragment() {
             }
             dialog.dismiss()
         }
+
+        hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { kitDataList ->
+            kitDataList.forEach { userData ->
+                if (!userData.localFlag) {
+                    userData.localFlag = true
+                    hemoCubeViewModel.bulkAddResultKitTestToDb(userData)
+                }
+            }
+            dialog.dismiss()
+        }
     }
 
     private fun deleteIncompleteRegistrations(userDataList: List<UserData>) {

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

@@ -23,8 +23,7 @@ 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,12 +9,10 @@ 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
@@ -28,7 +26,9 @@ import com.google.firebase.ktx.Firebase
 import com.google.firebase.perf.ktx.performance
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
+import kotlin.math.abs
 import kotlin.math.log10
+import kotlin.math.round
 
 class HemoCubeFragment : Fragment() {
 
@@ -39,6 +39,7 @@ class HemoCubeFragment : Fragment() {
     private var isOnline = false
     private var currentDeviceData: DeviceData? = null
     private var resultData: String = ""
+    private var currentResultData: String = ""
     private var isUsingExistingBuffer = false
     private var isTestOngoing = false
     private var startListening = MutableLiveData<Boolean>(false)
@@ -135,32 +136,14 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 showToast(R.string.test_upload)
+
                 activity?.runOnUiThread {
                     binding.btnSubmit.visibility = View.GONE
-                    val i = Intent(
-                        requireContext().applicationContext,
-                        DashboardActivity::class.java
-                    )
-                    startActivity(i)
-                }
-                hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
-                    when (it) {
-                        is Result.Success -> {
-                            it.data.data?.get(0)?.rawData?.let { it1 ->
-                                hemoCubeViewModel.updateMolbioFlag(
-                                    it1._id)
-                            }
-                        }
-                        is Result.Error -> {
-                            //Remove this line of code while deploying to IOCL
-                            it.exception.let { message ->
-                                Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
-                                    .show()
-                            }
-                        }
+                        val i = Intent(
+                            requireContext().applicationContext, DashboardActivity::class.java
+                        )
+                        startActivity(i)
 
-                        else -> {}
-                    }
                 }
             }
             if (result == "Local") {
@@ -269,7 +252,6 @@ class HemoCubeFragment : Fragment() {
         if (DataHolder.hemoCubeTestData == null) {
             DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData()
         }
-
         hemoCubeViewModel.progressBar.postValue(true)
 
         val fullReadOutput = StringBuilder()
@@ -281,7 +263,7 @@ class HemoCubeFragment : Fragment() {
                     data?.let {
                         val stringData = String(it)
                         fullReadOutput.append(stringData)
-                        handleUsbData(stringData, testStatusCode)
+                        handleUsbData(stringData)
                     }
                 }
 
@@ -314,13 +296,14 @@ class HemoCubeFragment : Fragment() {
             })
     }
 
-    private fun handleUsbData(stringData: String, testStatusCode: Double) {
+    private fun handleUsbData(stringData: String) {
         if (stringData.contains("#")) {
             isTestOngoing = true
         }
 
         resultData += stringData
-        hemoCubeViewModel.deviceMessages.postValue(resultData)
+        currentResultData += stringData
+        hemoCubeViewModel.deviceMessages.postValue(currentResultData)
 
         when {
             resultData.contains("SNE") && this.testStatusCode < Constants.TEST_STATUS_CODE_CONFIG_COMPLETED -> {
@@ -357,7 +340,7 @@ class HemoCubeFragment : Fragment() {
                 }
             }
 
-            resultData.contains("#SS") && this.testStatusCode < Constants.TEST_STATUS_CODE_SAMPLE_STARTED -> {
+            resultData.contains("#SS1") && 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)
@@ -365,19 +348,60 @@ class HemoCubeFragment : Fragment() {
                 }
             }
 
-            resultData.contains("#SC") && this.testStatusCode < Constants.TEST_STATUS_CODE_SAMPLE_COMPLETED -> {
+            resultData.contains("#SC1") && 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()
+                currentResultData = ""
                 testingTrace.stop()
             }
 
+            resultData.contains("ovf") -> {
+                hemoCubeViewModel.messages.postValue(
+                    getString(R.string.power_bank)
+                )
+            }
+            
+            currentResultData.contains("#SS2") && this.testStatusCode < Constants.TEST_STATUS_CODE_FIRST_GAIN_STARTED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_FIRST_GAIN_STARTED
+                hemoCubeViewModel.messages.postValue("1.3X Gain Started")
+            }
+
+            currentResultData.contains("#SC2") && this.testStatusCode < Constants.TEST_STATUS_CODE_FIRST_GAIN_COMPLETED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_FIRST_GAIN_COMPLETED
+                hemoCubeViewModel.messages.postValue("1.3X Gain Completed")
+                fetchResult()
+            }
+
+            currentResultData.contains("#SS3") && this.testStatusCode < Constants.TEST_STATUS_CODE_SECOND_GAIN_STARTED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_SECOND_GAIN_STARTED
+                hemoCubeViewModel.messages.postValue("2X Gain Started")
+            }
+
+            currentResultData.contains("#SC3") && this.testStatusCode < Constants.TEST_STATUS_CODE_SECOND_GAIN_COMPLETED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_SECOND_GAIN_COMPLETED
+                hemoCubeViewModel.messages.postValue("2X Gain Completed")
+                fetchResult()
+            }
+
+            currentResultData.contains("#SS5") && this.testStatusCode < Constants.TEST_STATUS_CODE_FORTH_GAIN_STARTED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_FORTH_GAIN_STARTED
+                hemoCubeViewModel.messages.postValue("7.6X Gain Started")
+            }
+
+            currentResultData.contains("#SC5") && this.testStatusCode < Constants.TEST_STATUS_CODE_FORTH_GAIN_COMPLETED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_FORTH_GAIN_COMPLETED
+                hemoCubeViewModel.messages.postValue("7.6X Gain Completed")
+                fetchResult()
+            }
+
             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)
                 )
+
                 val resultLines = resultData.split("\\s+(?=LB|LS)".toRegex())
                 var bufferIntensity = resultLines[1].split(' ')[1].trim()
                 led1BufferForDevice = if (isUsingExistingBuffer) {
@@ -414,6 +438,60 @@ class HemoCubeFragment : Fragment() {
                 led4SampleForDevice =
                     resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
                 processResult()
+                sendFirstGainCommand()
+                currentResultData = ""
+            }
+
+            currentResultData.contains("REND") && this.testStatusCode >= Constants.TEST_STATUS_CODE_FIRST_GAIN_COMPLETED && this.testStatusCode < Constants.TEST_STATUS_CODE_FIRST_GAIN_PRINT_COMPLETED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_FIRST_GAIN_PRINT_COMPLETED
+                hemoCubeViewModel.messages.postValue("1.3X gain data gathered")
+
+                val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
+                DataHolder.hemoCubeTestData?.apply {
+                    led1Gain1 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
+                    led2Gain1 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
+                    led3Gain1 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
+                    led4Gain1 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
+                }
+
+                sendSecondGainCommand()
+                currentResultData = ""
+            }
+
+            currentResultData.contains("REND") && this.testStatusCode >= Constants.TEST_STATUS_CODE_FIRST_GAIN_PRINT_COMPLETED && this.testStatusCode < Constants.TEST_STATUS_CODE_SECOND_GAIN_PRINT_COMPLETED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_SECOND_GAIN_PRINT_COMPLETED
+                hemoCubeViewModel.messages.postValue("2X gain data gathered")
+
+                val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
+                DataHolder.hemoCubeTestData?.apply {
+                    led1Gain2 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
+                    led2Gain2 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
+                    led3Gain2 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
+                    led4Gain2 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
+                }
+
+                sendForthGainCommand()
+                currentResultData = ""
+            }
+
+            currentResultData.contains("REND") && this.testStatusCode >= Constants.TEST_STATUS_CODE_SECOND_GAIN_PRINT_COMPLETED && this.testStatusCode < Constants.TEST_STATUS_CODE_FORTH_GAIN_PRINT_COMPLETED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_FORTH_GAIN_PRINT_COMPLETED
+                hemoCubeViewModel.messages.postValue("7.6X gain data gathered")
+
+                val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
+                DataHolder.hemoCubeTestData?.apply {
+                    led1Gain4 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
+                    led2Gain4 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
+                    led3Gain4 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
+                    led4Gain4 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
+                }
+
+                activity?.runOnUiThread {
+                    binding.btnSubmit.visibility = View.VISIBLE
+                    binding.btnSubmit.isEnabled = true
+                    binding.btnSubmit.isClickable = true
+                    binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
+                }
             }
         }
     }
@@ -501,13 +579,9 @@ class HemoCubeFragment : Fragment() {
                     binding.errorMessage.text =
                         getString(R.string.error_improper_buffer_high)
                     binding.errorMessage.visibility = View.VISIBLE
-                    binding.btnSubmit.isEnabled = true
-                    binding.btnSubmit.isClickable = true
                 }
             }
 
-
-
             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!!)!!
@@ -526,6 +600,10 @@ class HemoCubeFragment : Fragment() {
 
             _predictedDenovixRatio = fittedAbs3.div(fittedAbs1)
 
+            val slope = (led1Average - led2Average) / (435 - 415)
+            val _slopeRatio = abs(led3Average / slope)
+            val slopeClass = slopeRatioClassification(_slopeRatio)
+
             if (fittedAbs1 <= fittedAbs2) {
                 validationError = true
                 allErrorMessages += "Error: Invalid Test. Problem with de-oxygenation" + "\n"
@@ -543,6 +621,14 @@ class HemoCubeFragment : Fragment() {
                 }
             }
 
+            if ((led1Average < 0.7 || led2Average < 0.7 || led3Average < 0.7 || led4Average < 0.7) && _slopeRatio > 35.0) {
+                validationError = true
+                activity?.runOnUiThread {
+                    binding.errorMessage.text = "Severely Low Hb. Repeat test with 12 ul in 2 ml Buffer"
+                    binding.errorMessage.visibility = View.VISIBLE
+                }
+            }
+
             if (fittedAbs3 < 0.1) {
                 validationError = true
                 allErrorMessages += "Error: Low Hb. Repeat test" + "\n"
@@ -574,11 +660,14 @@ class HemoCubeFragment : Fragment() {
                 this.deviceRatio = deviceRatio
                 this.calculatedRatio = calculateRatio(deviceRatio)
                 this.predictedDenovixRatio = _predictedDenovixRatio
+                this.slopeRatio = _slopeRatio
                 this.coefficients = currentDeviceData?.coefficients?.get(0)
                     .toString() + ", " + currentDeviceData?.coefficients?.get(1).toString()
                 this.classificationResult = findResult(calculatedRatio)
                 this.prdClassification = absorbanceBasedClassification(predictedDenovixRatio)
-                hemoCubeViewModel.messages.postValue(this.prdClassification)
+                this.deviceRatioClass = deviceRatioClassification(deviceRatio)
+                this.slopeRatioClass = slopeClass
+                hemoCubeViewModel.messages.postValue("Slope Ratio: ${round(slopeRatio!!)},\n Slope Class: ${this.slopeRatioClass}\n")
                 this.errorMessages = allErrorMessages
                 this.resultData = deviceLog
                 this.batteryLevel = hemoCubeViewModel.getBatteryLevel().toString()
@@ -602,12 +691,12 @@ class HemoCubeFragment : Fragment() {
             }
 
 //            if (!validationError) {
-            activity?.runOnUiThread {
-                binding.btnSubmit.visibility = View.VISIBLE
-                binding.btnSubmit.isEnabled = true
-                binding.btnSubmit.isClickable = true
-                binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
-            }
+//                activity?.runOnUiThread {
+//                    binding.btnSubmit.visibility = View.VISIBLE
+//                    binding.btnSubmit.isEnabled = true
+//                    binding.btnSubmit.isClickable = true
+//                    binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
+//                }
 //            }
         } catch (e: Exception) {
             Toast.makeText(
@@ -625,17 +714,8 @@ 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) {
-                    activity?.runOnUiThread {
-                        binding.tvSubtitle4.setTextColor(
-                            ContextCompat.getColor(
-                                requireContext(),
-                                R.color.brightGreen
-                            )
-                        )
-                    }
+                if (calculatedRatio in 0.05..0.155)
                     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)
@@ -657,21 +737,62 @@ class HemoCubeFragment : Fragment() {
         return getString(R.string.invalid)
     }
 
+    fun deviceRatioClassification(ratio: Double?): String {
+        try {
+            hemoCubeViewModel.messages.postValue("result classification")
+            if (ratio != null) {
+                if (ratio in 0.0..0.4)
+                    return getString(R.string.normal)
+                if (ratio in 0.4..0.45)
+                    return getString(R.string.negative_borderline)
+                if (ratio in 0.45..0.55)
+                    return getString(R.string.sickle_cell_trait)
+                if (ratio in 0.55..0.575)
+                    return getString(R.string.positive_for_sickle_cell)
+                if (ratio in 0.09..1.0)
+                    return getString(R.string.sickle_cell_disease)
+            } else {
+                return getString(R.string.invalid)
+            }
+        } catch (e: Exception) {
+            showToast(R.string.error_classification)
+            Firebase.crashlytics.recordException(e)
+            return getString(R.string.error)
+        }
+        return getString(R.string.invalid)
+    }
+
+    fun slopeRatioClassification(ratio: Double?): String {
+        try {
+            hemoCubeViewModel.messages.postValue("result classification")
+            if (ratio != null) {
+                if (ratio in 0.0..30.0)
+                    return getString(R.string.normal)
+                if (ratio in 30.0..35.0)
+                    return getString(R.string.negative_borderline)
+                if (ratio in 35.0..50.0)
+                    return getString(R.string.sickle_cell_trait)
+                if (ratio in 50.0..60.0)
+                    return getString(R.string.positive_for_sickle_cell)
+                if (ratio > 60.0)
+                    return getString(R.string.sickle_cell_disease)
+            } else {
+                return getString(R.string.invalid)
+            }
+        } catch (e: Exception) {
+            showToast(R.string.error_classification)
+            Firebase.crashlytics.recordException(e)
+            return getString(R.string.error)
+        }
+        return getString(R.string.invalid)
+    }
+
     private fun absorbanceBasedClassification(predictedDenovixRatio: Double?): String {
         try {
             hemoCubeViewModel.messages.postValue("result classification")
             if (predictedDenovixRatio != null) {
-                if (predictedDenovixRatio in 0.0..0.16) {
-                    activity?.runOnUiThread {
-                        binding.tvSubtitle4.setTextColor(
-                            ContextCompat.getColor(
-                                requireContext(),
-                                R.color.brightGreen
-                            )
-                        )
-                    }
+                if (predictedDenovixRatio in 0.0..0.16)
                     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)
@@ -726,10 +847,62 @@ class HemoCubeFragment : Fragment() {
             })
     }
 
+    private fun sendFirstGainCommand() {
+        hemoCubeViewModel.progressBar.postValue(true)
+
+        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.FIRST_GAIN_COMMAND,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {}
+
+                override fun onUsbError(e: Exception?) {
+                    hemoCubeViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+
+    private fun sendSecondGainCommand() {
+        hemoCubeViewModel.progressBar.postValue(true)
+
+        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.SECOND_GAIN_COMMAND,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {}
+
+                override fun onUsbError(e: Exception?) {
+                    hemoCubeViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+
+    private fun sendThirdGainCommand() {
+        hemoCubeViewModel.progressBar.postValue(true)
+
+        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.THIRD_GAIN_COMMAND,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {}
+
+                override fun onUsbError(e: Exception?) {
+                    hemoCubeViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+
+    private fun sendForthGainCommand() {
+        hemoCubeViewModel.progressBar.postValue(true)
+
+        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.FORTH_GAIN_COMMAND,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {}
+
+                override fun onUsbError(e: Exception?) {
+                    hemoCubeViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+
     private fun fetchResult() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.getSample,
+        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.PRINT_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
 
@@ -750,4 +923,4 @@ class HemoCubeFragment : Fragment() {
             return true
         return false
     }
-}
+}

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

@@ -12,35 +12,17 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
-import com.example.hpostesting.data.model.log.UploadLogsResponse
-import com.example.hpostesting.data.model.login.LoginRequest
-import com.example.hpostesting.data.model.login.LoginResponse
-import com.example.hpostesting.data.model.molbioresult.MolbioV2Result
-import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultRequest
-import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultResponse
 import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.data.model.updates.CheckUpdateRequest
-import com.example.hpostesting.data.model.updates.CheckUpdateResponse
-import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
-import com.example.hpostesting.data.repository.DatabaseRepository
 import com.example.hpostesting.data.repository.Repository
-import com.example.hpostesting.domain.LogFileManager
-import com.example.hpostesting.presentation.hemocube.HemoCubeFragmentDirections.Companion
 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
@@ -49,38 +31,23 @@ import javax.inject.Inject
 @HiltViewModel
 class HemoCubeViewModel @Inject constructor(
     private val hemoCubeDao: HemoCubeDao,
+    private val hemoCubeBufferDao: HemoCubeBufferDao,
     private val repository: Repository,
-    private val databaseRepository: DatabaseRepository,
-    private val logFileManager: LogFileManager,
-    context: Context
+    context: Context,
 ) : ViewModel() {
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
-    private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
+    val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
     val messages = MutableLiveData<String>()
     private val sharedPreference: SharedPreferences =
         context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
 
-    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 allKitTestData = hemoCubeBufferDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
-
-
     val networkStatusLiveData: LiveData<Boolean>
         get() = _networkStatusLiveData
     val deviceMessages = MutableLiveData<String?>()
@@ -92,79 +59,30 @@ class HemoCubeViewModel @Inject constructor(
             context.registerReceiver(null, ifilter)
         }
 
-    fun uploadHemoCubeResultToDatabase(
-        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 = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                ).format(Calendar.getInstance().time)
-                hemoCubeDao.insertAll(testDetails!!)
-                fireBaseUpload.postValue("Local")
+    fun uploadHemoCubeResultToDatabase(isOnline: Boolean, testStatus: Boolean, kitSerial: String?) =
+        viewModelScope.launch {
+            if (kitSerial != null) {
+                testDetails?.kitSerial = kitSerial
             }
-        } catch (e: Exception) {
-            Log.e("Testdb", "Upload failed: ${e.message}")
-        }
-    }
+            testDetails?.testStatus = testStatus
 
-    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 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)
+            try {
+                if (isOnline) {
+                    parseData()
+                    addResultTestToDb()
+                } else {
+                    parseData()
+                    testDetails?.testTime = SimpleDateFormat(
+                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                    ).format(Calendar.getInstance().time)
+                    hemoCubeDao.insertAll(testDetails!!)
+                    fireBaseUpload.postValue("Local")
                 }
+            } catch (e: Exception) {
+                Log.e("Testdb", "Upload failed: ${e.message}")
             }
         }
-    }
+
 
     fun uploadHemoCubeResultToDatabaseforbuffercheckN(bufferCheckData: BufferCheckData) =
         viewModelScope.launch {
@@ -175,6 +93,40 @@ class HemoCubeViewModel @Inject constructor(
         deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
     }
 
+
+    fun uploadHemoCubeResultToDatabaseForBufferCheck(
+        isOnline: Boolean,
+        bufferCheckData: BufferCheckData,
+    ) =
+        viewModelScope.launch {
+            if (isOnline) {
+                try {
+                    when (val response =
+                        repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
+                        is Response.Success -> {
+                            Log.i("Testdb", "Data uploaded to Firestore successfully")
+                            fireBaseUpload.postValue("Success")
+                            bufferCheckData.localFlag = true
+                            hemoCubeBufferDao.insertAll(bufferCheckData)
+                        }
+
+                        is Response.Error -> {
+                            Log.e("Testdb", "Error uploading data to Firestore: $response")
+                            fireBaseUpload.postValue("Error")
+                            bufferCheckData.localFlag = true
+                            hemoCubeBufferDao.insertAll(bufferCheckData)
+                        }
+                    }
+                } catch (e: Exception) {
+                    Log.e("Testdb", "Exception during data upload: ${e.message}")
+                    fireBaseUpload.postValue("Error")
+                }
+            } else {
+                hemoCubeBufferDao.insertAll(bufferCheckData)
+                fireBaseUpload.postValue("Local")
+            }
+        }
+
     private fun parseData() {
         testDetails?.deviceRatio = DataHolder.hemocubeResult
         testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
@@ -209,6 +161,7 @@ class HemoCubeViewModel @Inject constructor(
         testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients
         testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
         testDetails?.prdClassification = DataHolder.hemoCubeTestData?.prdClassification.toString()
+        testDetails?.errorMessages = DataHolder.hemoCubeTestData?.errorMessages.toString()
         testDetails?.batteryLevel = DataHolder.hemoCubeTestData?.batteryLevel.toString()
         testDetails?.batteryCapacity = DataHolder.hemoCubeTestData?.batteryCapacity.toString()
         testDetails?.batteryMaxCapacity = DataHolder.hemoCubeTestData?.batteryMaxCapacity.toString()
@@ -233,7 +186,6 @@ class HemoCubeViewModel @Inject constructor(
                         Log.i("Testdb", "Data uploaded to Firestore successfully")
                         fireBaseUpload.postValue("Success")
                         testDetails.localFlag = true
-                        uploadResult(MolbioV2ResultRequest(listOf(MolbioV2Result(rawData = testDetails))))
                         hemoCubeDao.insertAll(testDetails)
                     }
 
@@ -242,8 +194,6 @@ class HemoCubeViewModel @Inject constructor(
                         fireBaseUpload.postValue("Error")
                         hemoCubeDao.insertAll(testDetails)
                     }
-
-                    else -> {}
                 }
             } catch (e: Exception) {
                 Log.e("Testdb", "Exception during data upload: ${e.message}")
@@ -252,11 +202,30 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
+    fun bulkAddResultKitTestToDb(bufferCheckData: BufferCheckData) {
+        viewModelScope.launch {
+            bufferCheckData.reportUploadTime = SimpleDateFormat(
+                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+            ).format(Calendar.getInstance().time)
+            when (repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
+                is Response.Success -> {
+                    fireBaseBulkUpload.postValue("Success")
+                    updateBufferLocalFlag(bufferCheckData._id)
+                }
+
+                else -> {
+                    fireBaseBulkUpload.postValue("Error")
+                }
+            }
+        }
+    }
+
     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")
@@ -266,8 +235,6 @@ 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}")
@@ -276,6 +243,12 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
+    private fun updateBufferLocalFlag(bufferId: String) =
+        viewModelScope.launch {
+            hemoCubeBufferDao.updateFieldById(id = bufferId, true)
+        }
+
+
     fun bulkAddResultTestToDb(userData: HemoCubeTestData) {
         viewModelScope.launch {
             userData.reportUploadTime = SimpleDateFormat(
@@ -294,17 +267,15 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
-    private fun updateLocalFlag(userId: String) = viewModelScope.launch {
-        hemoCubeDao.updateFieldById(id = userId, true)
-    }
+    private fun updateLocalFlag(userId: String) =
+        viewModelScope.launch {
+            hemoCubeDao.updateFieldById(id = userId, true)
+        }
 
-    fun updateMolbioFlag(userId: String) = viewModelScope.launch {
-        hemoCubeDao.updateFieldById(id = userId, true)
-    }
-
-    fun addUser(userData: HemoCubeTestData) = viewModelScope.launch {
-        hemoCubeDao.insertAll(userData)
-    }
+    fun addUser(userData: HemoCubeTestData) =
+        viewModelScope.launch {
+            hemoCubeDao.insertAll(userData)
+        }
 
     fun deleteById(userId: String) = viewModelScope.launch {
         hemoCubeDao.deleteById(id = userId)
@@ -312,17 +283,31 @@ class HemoCubeViewModel @Inject constructor(
 
     fun getBatteryLevel(): Float? {
         val batteryPct: Float? = batteryStatus?.let { intent ->
-            val level: Int = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1)
-            val scale: Int = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1)
+            val level: Int =
+                intent.getIntExtra(
+                    BatteryManager.EXTRA_LEVEL,
+                    -1
+                )
+            val scale: Int =
+                intent.getIntExtra(
+                    BatteryManager.EXTRA_SCALE,
+                    -1
+                )
             level * 100 / scale.toFloat()
         }
 
         return batteryPct
     }
 
-    fun getBatteryTemperature(): Float? {
+    fun getBatteryTemperature()
+
+            : Float
+    ? {
         val batteryTemp: Float? = batteryStatus?.let { intent ->
-            val temperature = intent.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0)
+            val temperature = intent?.getIntExtra(
+                BatteryManager.EXTRA_TEMPERATURE,
+                0
+            ) ?: 0
             temperature.toFloat() / 10
         }
 
@@ -331,27 +316,39 @@ class HemoCubeViewModel @Inject constructor(
 
     fun getBatteryVoltage(context: Context): Float {
         val batteryIntent =
-            context.registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
-        val voltage = batteryIntent?.getIntExtra(BatteryManager.EXTRA_VOLTAGE, 0) ?: 0
+            context.registerReceiver(
+                null,
+                IntentFilter(Intent.ACTION_BATTERY_CHANGED)
+            )
+        val voltage = batteryIntent?.getIntExtra(
+            BatteryManager.EXTRA_VOLTAGE,
+            0
+        ) ?: 0
 
         // milli-volts to volts
         return voltage.toFloat() / 1000
     }
 
-    fun getBatteryCapacity(context: Context): Int {
-        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
 
-        return batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
+    fun getBatteryCapacity(context: Context): Int {
+        val batteryManager =
+            context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+        val currentCapacity =
+            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
+
+        return currentCapacity
     }
 
     fun getBatteryMaxCapacity(context: Context): Float {
         val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-        val designCapacity = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+        val 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 currentCapacity.toFloat() / designCapacity.toFloat() * 100
+        return maxCapacity
     }
-}
+}

app/src/main/java/com/example/hpostesting/util/PropertyProviderImpl.kt

@@ -1,15 +0,0 @@
-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/layout/fragment_hemo_cube_reference.xml

@@ -205,20 +205,25 @@
             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"
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="72dp"
-            android:gravity="center"
-            android:textColor="@color/black"
-            android:textSize="11sp"
+            android:layout_marginTop="12dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/error_message" />
+            app:layout_constraintTop_toBottomOf="@id/error_message">
+
+            <TextView
+                android:id="@+id/tv_device_messages"
+                style="@style/title1_1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textColor="@color/black"
+                android:textSize="11sp"
+                android:visibility="gone" />
+        </ScrollView>
 
         <Button
             android:visibility="gone"

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

@@ -170,7 +170,7 @@
     <string name="aadhaar_in_tv"><b>ಆಧಾರ್ ಸಂಖ್ಯೆ</b></string>
     <string name="please_use_official_abha_app_to_create_abha_id_and_come_back">ದಯವಿಟ್ಟು "ಆಧಿಕಾರಿ ABHA ಆಪ್" ಅನ್ನು ಬಳಸಿ ABHA ಐಡಿ ರಚಿಸಿ ಮತ್ತು ಹಿಂತಿರುಗಿ ಬನ್ನಿ.</string>
     <string name="please_enter_aadhaar">ಮುಂದುವರಿಸಲು ದಯವಿಟ್ಟು ಆಧಾರ್ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="scan_qr_code_of_the_kit">ಕಿಟ್ ಯಾವಾಗಲೂ QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
+    <string name="scan_qr_code_of_the_kit">ಕಿಟ್‌ನ ಕ್ಯೂಆರ್ ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
     <string name="enter_kit_serial_number_manually">ಕಿಟ್ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಯನ್ನು ಕೈಯಿಂದ ನಮೂದಿಸಿ</string>
     <string name="serial_number">ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ</string>
     <string name="set_baseline_reference_again">ಬೇಸ್ಲೈನ್/ಸಂದರ್ಭ ಹೊಂದಿಸಿರಾ?</string>

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

@@ -9,8 +9,6 @@
     <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>
@@ -19,7 +17,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

@@ -232,7 +232,6 @@
     <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>
@@ -253,6 +252,7 @@
     <string name="sample_started">Sample Started</string>
     <string name="buffer_completed">Buffer Completed</string>
     <string name="buffer_started">Buffer Started</string>
+    <string name="power_bank">Connect with Power Bank</string>
     <string name="start">Start</string>
     <string name="place_sample">Place Sample</string>
     <string name="invalid">Invalid</string>

app/src/main/res/xml/file_paths.xml

@@ -1,3 +0,0 @@
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <external-files-path name="Updates" path="." />
-</paths>