fixed usb permission error for v1 device

.idea/gradle.xml

@@ -4,8 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

README.md

@@ -1,4 +0,0 @@
-
-### Release key
-
-	key0: prime24

app/.gitignore

@@ -1,4 +1,3 @@
 /build
-/release
 /google-services*
 /idea

app/build.gradle

@@ -14,13 +14,13 @@ android {
     compileSdk 34
     namespace 'in.sminnovations.hpostesting'
 
-    // dev -> development, quality -> qc, uat -> User Acceptance Testing, preprod -> preproduction, prod -> production, iocl -> iocl-iisc production
+    // dev - development, quality - qc, uat - User Acceptance Test, preprod - preproduction, prod - production
     defaultConfig {
-        applicationId "in.sminnovations.hpostesting.dev"
+        applicationId "in.sminnovations.hpostesting.quality"
         minSdk 21
         targetSdk 34
-        versionCode 114
+        versionCode 106
-        versionName "2.1.114"
+        versionName "2.1.106"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -80,16 +80,16 @@ dependencies {
     implementation 'com.google.firebase:firebase-auth-ktx'
     implementation 'com.google.firebase:firebase-storage-ktx'
     implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
-    implementation 'com.google.android.gms:play-services-auth:21.0.0'
+    implementation 'com.google.android.gms:play-services-auth:20.7.0'
     implementation 'com.google.android.gms:play-services-location:21.1.0'
     implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
     implementation 'com.google.android.things:androidthings:1.0'
-    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta12'
+    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta11'
-    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta12")
+    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.4'
+    implementation 'io.nats:jnats:2.11.2'
 
 
 
@@ -143,8 +143,8 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
 
     // Navigation Component
-    implementation "androidx.navigation:navigation-fragment-ktx:2.7.7"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.7.6"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.7"
+    implementation "androidx.navigation:navigation-ui-ktx:2.7.6"
 
     //Dagger - Hilt
     implementation "com.google.dagger:hilt-android:2.46"

app/google-services.json

@@ -1,205 +1,45 @@
 {
   "project_info": {
-    "project_number": "650071678820",
+    "project_number": "1004619739289",
-    "project_id": "hpos-af3cc",
+    "project_id": "hpos-qa",
-    "storage_bucket": "hpos-af3cc.appspot.com"
+    "storage_bucket": "hpos-qa.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f1435a1c07f710036c6471",
+        "mobilesdk_app_id": "1:1004619739289:android:f669b47552748433e5c808",
         "android_client_info": {
-          "package_name": "com.example.hposconsentform"
+          "package_name": "in.sminnovations.hposregistration.quality"
         }
       },
-      "oauth_client": [
+      "oauth_client": [],
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
       "api_key": [
         {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+          "current_key": "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs"
         }
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
+          "other_platform_oauth_client": []
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
         }
       }
     },
     {
       "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:7865bef608cdee6f6c6471",
+        "mobilesdk_app_id": "1:1004619739289:android:8397cd1f0357bd89e5c808",
         "android_client_info": {
-          "package_name": "com.smi.counselling"
+          "package_name": "in.sminnovations.hpostesting.quality"
         }
       },
-      "oauth_client": [
+      "oauth_client": [],
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
       "api_key": [
         {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+          "current_key": "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs"
         }
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
+          "other_platform_oauth_client": []
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:2925e9ce3417d2386c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hemocube"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-srhm9spm9hjn4frcd3r6o02gdhdbtd15.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "in.sminnovations.hemocube",
-            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
-          }
-        },
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hposregistration"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-70kp5jvjda4r5diqch2kn4lc40p4f42g.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "in.sminnovations.hposregistration",
-            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
-          }
-        },
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f96be19e5d43102b6c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-l87dnr0bdj95get0khgnvfv2an1k6ogq.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "in.sminnovations.hpostesting",
-            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
-          }
-        },
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:a53292637abb7c0d6c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting.dev"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
         }
       }
     }

app/src/main/AndroidManifest.xml

@@ -48,10 +48,6 @@
             android:name="com.example.hpostesting.presentation.autodac.AutoDacActivity"
             android:exported="false"
             android:theme="@style/Theme.HPOS.NoActionBar" />
-        <activity
-            android:name="com.example.hpostesting.presentation.jig.JigActivity"
-            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
             android:name="com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity"
             android:exported="false"
@@ -123,8 +119,13 @@
             android:noHistory="true"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
+                    <category android:name="android.intent.category.HOME" />
+                    <category android:name="android.intent.category.DEFAULT" />
+                    <category android:name="android.intent.category.MONKEY"/>
+                    <category android:name="android.intent.category.LAUNCHER_APP" />
+
             </intent-filter>
         </activity>
         <activity
@@ -161,7 +162,7 @@
             android:screenOrientation="portrait"
             android:stateNotNeeded="true"
             tools:replace="android:screenOrientation" />
-<!--        ${applicationId}-->
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"

app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt

@@ -1,15 +1,20 @@
 package com.example.hpostesting
 
 import android.app.Application
+import android.content.Context
+import androidx.room.Room
+import com.example.hpostesting.data.dao.MyDatabase
+import com.google.android.datatransport.runtime.dagger.Provides
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.FirebaseFirestoreSettings
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import javax.inject.Singleton
 
 @HiltAndroidApp
-class HPOSTestingApplication : Application() {
+class HPOSTestingApplication: Application() {
     val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
     override fun onCreate() {

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

@@ -1,7 +1,5 @@
 package com.example.hpostesting.data.api
 
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.login.LoginRequest
@@ -13,12 +11,11 @@ interface MolbioAuthApi {
 
     @POST("deviceManagement/device/provision")
     suspend fun deviceProvision(
-        @Body deviceProvisionRequest: DeviceProvisionRequest,
+        @Body deviceProvisionRequest: DeviceProvisionRequest
     ): DeviceProvisionResponse
 
     @POST("deviceService/device/login")
     suspend fun login(
-        @Body loginRequest: LoginRequest,
+        @Body loginRequest: LoginRequest
     ): LoginResponse
-
 }

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

@@ -1,7 +1,5 @@
 package com.example.hpostesting.data.api
 
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.log.UploadLogsResponse
 import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultRequest
 import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultResponse
@@ -9,9 +7,11 @@ 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.Response
 import okhttp3.ResponseBody
 import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.Header
 import retrofit2.http.Multipart
 import retrofit2.http.POST
 import retrofit2.http.PUT
@@ -21,17 +21,17 @@ interface MolbioResultApi {
 
     @PUT("deviceService/results/HPOS")
     suspend fun uploadResults(
-        @Body molbioV2ResultRequest: MolbioV2ResultRequest,
+        @Body molbioV2ResultRequest: MolbioV2ResultRequest
     ): MolbioV2ResultResponse
 
     @POST("deviceService/device/checkUpdate")
     suspend fun checkUpdate(
-        @Body checkUpdateRequest: CheckUpdateRequest,
+        @Body checkUpdateRequest: CheckUpdateRequest
     ): CheckUpdateResponse
 
     @POST("deviceService/device/getUpdate")
     suspend fun deviceUpdate(
-        @Body deviceUpdateRequest: DeviceUpdateRequest,
+        @Body deviceUpdateRequest: DeviceUpdateRequest
     ): ResponseBody
 
     @GET("deviceService/device/getClientCertificate")
@@ -41,12 +41,6 @@ interface MolbioResultApi {
     @Multipart
     @POST("deviceService/device/uploadLogs")
     suspend fun uploadLogs(
-        @Part logFile: MultipartBody.Part,
+        @Part logFile: MultipartBody.Part
     ): UploadLogsResponse
-
-
-    @PUT("deviceService/device/uploadDeviceDiagnostics")
-    suspend fun deviceDiagnostics(
-        @Body deviceDiagnosticsRequest: DeviceDiagnosticsRequest
-    ): DeviceDiagnosticsResponse
 }

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

@@ -1,13 +1,6 @@
 package com.example.hpostesting.data.api
 
-import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.presentation.UsbServiceListener
-
 interface PropertyProvider {
 
     fun getProperty(key: String): String
 }
-
-interface DeviceCommunicationHandler {
-    fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener)
-}

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

@@ -5,7 +5,7 @@ object Constants {
     const val HEMOCUBE_USB_PERMISSION = "shanmukha.in.sickle_cell_homocube.USB_PERMISSION"
 
     const val BASE_URL = "www.google.com"
-    const val DOCUMENT_ID_FOR_UPDATE ="2o71vBKLqdgEKYtFG8Lb"
+
     const val ABHA_APP_PACKAGE = "in.ndhm.phr"
 
     const val MOLBIO_INTEGRATION = false
@@ -61,14 +61,9 @@ object Constants {
 
     const val BLANK_EVERY_TEST = false
 
-    // jig
-    const val NAVIGATE_TO_TEST_JIG_DIRECTLY = false
-
     val STATICID = listOf(
         "FACTORY",
         "ADMIN",
-        "PQUSER",
-        "QCUSER",
         "VIZ-1000-0004",
         "VIZ-1000-0005",
         "VIZ-1000-0006",
@@ -172,64 +167,12 @@ object Constants {
         "HPP1-0124-0048",
         "HPP1-0124-0049",
         "HPP1-0124-0050",
-        "HCV-001-0001",
-        "HCV-001-0002",
-        "HCV-001-0003",
-        "HCV-001-0004",
-        "HCV-001-0005",
-        "HCV-001-0006",
-        "HCV-001-0007",
-        "HCV-001-0008",
-        "HCV-001-0009",
-        "HCV-001-0010",
-        "HCV-001-0011",
-        "HCV-001-0012",
-        "HCV-001-0013",
-        "HCV-001-0014",
-        "HCV-001-0015",
-        "HCV-001-0016",
-        "HCV-001-0017",
-        "HCV-001-0018",
-        "HCV-001-0019",
-        "HCV-001-0020",
-        "HCV-001-0021",
-        "HCV-001-0022",
-        "HCV-001-0023",
-        "HCV-001-0024",
-        "HCV-001-0025",
-        "HCV-001-0026",
-        "HCV-001-0027",
-        "HCV-001-0028",
-        "HCV-001-0029",
-        "HCV-001-0030",
-        "HCV-001-0031",
-        "HCV-001-0032",
-        "HCV-001-0033",
-        "HCV-001-0034",
-        "HCV-001-0003",
-        "HCV-001-0035",
-        "HCV-001-0036",
-        "HCV-001-0037",
-        "HCV-001-0038",
-        "HCV-001-0039",
-        "HCV-001-0040",
-        "HCV-001-0041",
-        "HCV-001-0042",
-        "HCV-001-0043",
-        "HCV-001-0044",
-        "HCV-001-0045",
-        "HCV-001-0046",
-        "HCV-001-0047",
-        "HCV-001-0048",
-        "HCV-001-0049",
-        "HCV-001-0050",
     )
 
     const val password = "SMI@12345"
 
     const val KIT_NUMBER = "KitNumber"
     const val KIT_COUNT = "KitCount"
-    const val KIT_CAPACITY = Int.MAX_VALUE // Enforceable
     const val BUFFER_VALUE_1 = "BufferValue1"
     const val BUFFER_VALUE_2 = "BufferValue2"
     const val BUFFER_VALUE_3 = "BufferValue3"
@@ -239,6 +182,19 @@ object Constants {
     const val BUFFER_LED_LOWER_BOUND = 21000
     const val BUFFER_LED_UPPER_BOUND = 23500
 
+    const val TEST_STATUS_CODE_TEST_STARTED = 1.0
+    const val TEST_STATUS_CODE_CONFIG_STARTED = 2.0
+    const val TEST_STATUS_CODE_CONFIG_COMPLETED = 3.0
+    const val TEST_STATUS_CODE_BUFFER_STARTED = 4.0
+    const val TEST_STATUS_CODE_BUFFER_COMPLETED = 5.0
+    const val TEST_STATUS_CODE_BUFFER_PRINT_STARTED = 6.0
+    const val TEST_STATUS_CODE_BUFFER_PRINT_COMPLETED = 7.0
+    const val TEST_STATUS_CODE_SAMPLE_STARTED = 8.0
+    const val TEST_STATUS_CODE_SAMPLE_COMPLETED = 9.0
+    const val TEST_STATUS_CODE_SAMPLE_PRINT_STARTED = 10.0
+    const val TEST_STATUS_CODE_SAMPLE_PRINT_COMPLETED = 11.0
+    const val TEST_STATUS_CODE_TEST_COMPLETED = 12.0
+
     val DEVICE_CONFIGURATION: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
         "HCV-000-3001" to listOf(
             listOf(1.0, 0.0),               // LED1, 435nm
@@ -1703,10 +1659,11 @@ object Constants {
         )
     )
 
+
     val COEFFICIENTS: Map<String, List<List<Double>>> = mapOf(
         "HC-V1-005" to listOf(
-            listOf(1.5, 0.0),
+            listOf(1.5,0.0),
-            listOf(0.0, 0.0)
+            listOf(0.0,0.0)
         )
     )
 

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

@@ -3,14 +3,12 @@ package com.example.hpostesting.data.constant
 enum class HemoCubeCommands(val command: String) {
     START_BUFFER_COMMAND("B\r"),
     AUTO_DAC_COMMAND("C\r"),
-    SET_AUTO_DAC_TO_EPROM_COMMAND("G\r"),
     DIAGNOSTICS_COMMAND("D\r"),
     FIRMWARE_INFO_COMMAND("F\r"),
     START_SAMPLE("S\r"),
     PRINT_COMMAND("P\r"),
     READ_DAC_COMMAND("R\r"),
     DEVICE_CONFIGURATION_COMMAND("I\r"),
-    LOAD_DAC_VALUES("E\r"),
     FIRST_GAIN_COMMAND("T\r"),
     SECOND_GAIN_COMMAND("U\r"),
     THIRD_GAIN_COMMAND("V\r"),

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

@@ -19,14 +19,12 @@ object LanguageManager {
     }
 
     fun persistLanguagePreference(context: Context, languageCode: String) {
-        val prefs: SharedPreferences =
+        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-            context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
         prefs.edit().putString(LANGUAGE_PREF_KEY, languageCode).apply()
     }
 
     fun getSavedLanguage(context: Context): String {
-        val prefs: SharedPreferences =
+        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-            context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
         return prefs.getString(LANGUAGE_PREF_KEY, "en") ?: "en"
     }
 }

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

@@ -8,9 +8,7 @@ enum class TestStatus(val code: Double) {
     FIRST_EMPTY_AIR_READING_COMPLETED(4.2),
     FIRST_EMPTY_AIR_READING_PRINT_STARTED(4.3),
     FIRST_EMPTY_AIR_READING_PRINT_COMPLETED(4.4),
-    EPROM_ADC_RETRIEVAL_STARTED(4.5),
+    BUFFER_STARTED(4.0),
-    EPROM_ADC_RETRIEVAL_COMPLETED(4.6),
-    BUFFER_STARTED(4.7),
     BUFFER_COMPLETED(5.0),
     BUFFER_PRINT_STARTED(6.0),
     BUFFER_PRINT_COMPLETED(7.0),

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

@@ -16,7 +16,6 @@ class Converters {
             null
         }
     }
-
     @TypeConverter
     fun toString(location: UserData.Location?): String? {
         return if (location != null) {

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

@@ -7,7 +7,7 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
-
+import com.example.hpostesting.data.model.patient.UserData
 @Dao
 interface DeviceDao {
     @Query("SELECT * from device_table")

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

@@ -29,8 +29,4 @@ interface HemoCubeDao {
 
     @Query("UPDATE hemo_cube_test_table SET isCSVCreated = :newValue WHERE _id = :id")
     suspend fun updateCSVFieldById(id: String, newValue: Boolean)
-
-    @Query("SELECT * from hemo_cube_test_table WHERE molbioFlag = :status")
-    suspend fun getPendingUser(status: Boolean): List<HemoCubeTestData>
-
 }

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

@@ -8,11 +8,7 @@ import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 
-@Database(
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], version = 24, exportSchema = false)
-    entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
-    version = 27,
-    exportSchema = false
-)
 @TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao

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

@@ -1,6 +1,11 @@
 package com.example.hpostesting.data.datasource
 
+import android.os.Environment
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.opencsv.CSVWriter
+import java.io.File
+import java.io.FileWriter
+import java.io.IOException
 
 interface LocalFileDataSource {
 
@@ -9,6 +14,6 @@ interface LocalFileDataSource {
     fun saveTextToDisk(filepath: String, contents: String)
 
     fun exportDataToCSV(
-        fileName: String, dataList: List<HemoCubeTestData>,
+        fileName: String, dataList: List<HemoCubeTestData>
     ): Boolean
 }

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

@@ -8,7 +8,7 @@ import java.io.FileWriter
 import java.io.IOException
 import javax.inject.Inject
 
-class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
+class LocalFileDataSourceImpl @Inject constructor(): LocalFileDataSource {
 
     override fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>) {
         val writer = CSVWriter(FileWriter(filepath))
@@ -25,13 +25,10 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
     }
 
     override fun exportDataToCSV(
-        fileName: String, dataList: List<HemoCubeTestData>,
+        fileName: String, dataList: List<HemoCubeTestData>
     ): Boolean {
         try {
-            val formattedFileName = fileName.replace(
+            val formattedFileName = fileName.replace(Regex("[^a-zA-Z0-9.-]"), "_") // Replace special characters with underscores
-                Regex("[^a-zA-Z0-9.-]"),
-                "_"
-            ) // Replace special characters with underscores
             val filePath = File(getExternalStorageDirectory(), formattedFileName)
             val writer = FileWriter(filePath)
             val csvWriter = CSVWriter(writer)

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/AdditionalDetails.kt

@@ -1,14 +0,0 @@
-package com.example.hpostesting.data.model.devicediagnostics
-
-data class AdditionalDetails(
-     val batteryLevel: String? = "",
-     val batteryCapacity: String? = "",
-     val batteryMaxCapacity: String? = "",
-     val batteryTemperature: String? = "",
-     val batteryVoltage: String? = "",
-)
-
-
-
-
-

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsData.kt

@@ -1,12 +0,0 @@
-package com.example.hpostesting.data.model.devicediagnostics
-
-data class DeviceDiagnosticsData(
-    val id: String? = "",
-    val deviceId: String? = "",
-    val additionalDetails: AdditionalDetails?= AdditionalDetails(),
-    val createdBy: String? = "",
-    val updatedBy: String? = "",
-    val updatedAt: String? = "",
-    val createdAt: String? = "",
-)
-

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsRequest.kt

@@ -1,5 +0,0 @@
-package com.example.hpostesting.data.model.devicediagnostics
-
-data class DeviceDiagnosticsRequest(
-    val additionalDetails: AdditionalDetails?= AdditionalDetails()
-)

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsResponse.kt

@@ -1,11 +0,0 @@
-package com.example.hpostesting.data.model.devicediagnostics
-
-import com.google.gson.annotations.SerializedName
-
-
-data class DeviceDiagnosticsResponse(
-    @SerializedName("Data")
-    val data: DeviceDiagnosticsData? = DeviceDiagnosticsData(),
-    val message: String? = "",
-    val result: String? = ""
-)

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

@@ -2,5 +2,5 @@ package com.example.hpostesting.data.model.deviceprovision
 
 data class Credentials(
     val password: String? = "",
-    val username: String? = "",
+    val username: String? = ""
 )

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

@@ -13,5 +13,5 @@ data class Device(
     val serialNumber: String? = "",
     val uid: String? = "",
     val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
+    val updatedBy: Int? = 0
 )

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

@@ -2,5 +2,5 @@ package com.example.hpostesting.data.model.deviceprovision
 
 data class DeviceProvisionData(
     val credentials: Credentials? = Credentials(),
-    val device: Device? = Device(),
+    val device: Device? = Device()
 )

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

@@ -5,5 +5,5 @@ data class DeviceProvisionRequest(
     val email: String? = "",
     val password: String? = "",
     val serialNumber: String? = "",
-    val uid: String? = "",
+    val uid: String? = ""
 )

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

@@ -8,5 +8,5 @@ data class DeviceProvisionResponse(
     @SerializedName("Message")
     val message: String? = "",
     @SerializedName("Result")
-    val result: String? = "",
+    val result: String? = ""
 )

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

@@ -8,5 +8,5 @@ data class DeviceType(
     val id: Int? = 0,
     val name: String? = "",
     val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
+    val updatedBy: Int? = 0
 )

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

@@ -11,5 +11,5 @@ data class DeviceUser(
     val natsTokenExpiry: String? = "",
     val updatedAt: String? = "",
     val updatedBy: Int? = 0,
-    val username: String? = "",
+    val username: String? = ""
 )

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

@@ -1,8 +0,0 @@
-package com.example.hpostesting.data.model.deviceprovision
-
-data class ProvisionData(
-    val username: String?,
-    val password: String?,
-    val natsToken: String?,
-)
-

app/src/main/java/com/example/hpostesting/data/model/diagnostics/DiagnosticsData.kt

@@ -1,6 +1,6 @@
 package com.example.hpostesting.data.model.diagnostics
 
-data class DiagnosticsData(
+data class DiagnosticsData (
     var deviceId: String = "",
     var appVersion: String? = "",
     var deviceType: String = "HEMOCUBE",
@@ -8,5 +8,5 @@ data class DiagnosticsData(
     var devicePassword: String = "",
     var deviceNatsToken: String = "",
     var accessToken: String = "",
-    var runTime: String = "",
+    var runTime: String = ""
 )

app/src/main/java/com/example/hpostesting/data/model/jig/JigData.kt

@@ -1,9 +0,0 @@
-package com.example.hpostesting.data.model.jig
-
-data class JigData(
-    var deviceId: String = "",
-    var appVersion: String? = "",
-    var deviceType: String = "JIG",
-    var scanData: String = "",
-    var createdAt: String = "",
-)

app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt

@@ -1,5 +1,5 @@
 package com.example.hpostesting.data.model.log
 
 data class UploadLogsData(
-    val filename: String? = "",
+    val filename: String? = ""
 )

app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt

@@ -8,5 +8,5 @@ data class UploadLogsResponse(
     @SerializedName("Message")
     val message: String? = "",
     @SerializedName("Result")
-    val result: String? = "",
+    val result: String? = ""
 )

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

@@ -12,5 +12,5 @@ data class Device(
     val serialNumber: String? = "",
     val uid: String? = "",
     val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
+    val updatedBy: Int? = 0
 )

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

@@ -8,5 +8,5 @@ data class DeviceType(
     val id: Int? = 0,
     val name: String? = "",
     val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
+    val updatedBy: Int? = 0
 )

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

@@ -12,5 +12,5 @@ data class DeviceUser(
     val natsTokenExpiry: String? = "",
     val updatedAt: String? = "",
     val updatedBy: Int? = 0,
-    val username: String? = "",
+    val username: String? = ""
 )

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

@@ -2,5 +2,5 @@ package com.example.hpostesting.data.model.login
 
 data class LoginData(
     val accessToken: String? = "",
-    val deviceUser: DeviceUser? = DeviceUser(),
+    val deviceUser: DeviceUser? = DeviceUser()
 )

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

@@ -9,5 +9,5 @@ data class LoginRequest(
     val password: String? = "",
     val serialNumber: String? = "",
     val username: String? = "",
-    val version: String? = "",
+    val version: String? = ""
 )

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

@@ -8,5 +8,5 @@ data class LoginResponse(
     @SerializedName("Message")
     val message: String? = "",
     @SerializedName("Result")
-    val result: String? = "",
+    val result: String? = ""
 )

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

@@ -4,7 +4,7 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 
 data class MolbioV2Result(
     val age: Int? = 31,
-    val analysisDate: String? = "2024-02-08 16:33:56",
+    val analysisDate: String? = "",
     val analysisId: String? = "",
     val analysisStatus: String? = "",
     val analysisType: String? = "HPOS",
@@ -12,11 +12,11 @@ data class MolbioV2Result(
     val bloodGroup: String? = "",
     val coefficients: List<Int>? = listOf(22, 22),
     val collectionLocation: List<Any>? = listOf(),
-    val collectionTime: String? = "2024-02-08 16:33:56",
+    val collectionTime: String? = "",
     val collector: String? = "",
     val curveFitting: String? = "Linear",
     val deviceName: String? = "HPOS",
-    val expiryTime: String? = "2024-02-08 16:33:56",
+    val expiryTime: String? = "",
     val gender: String? = "",
     val interpretation: String? = "",
     val `operator`: String? = "",
@@ -30,9 +30,9 @@ data class MolbioV2Result(
     val testId: String? = "",
     val testResult: String? = "",
     val testStatus: String? = "",
-    val testTime: String? = "2024-02-08 16:33:56",
+    val testTime: String? = "",
     val testType: String? = "",
     val thresholds: String? = "",
     val underMedication: Boolean? = false,
-    val volume: Int? = 2,
+    val volume: Int? = 2
 )

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

@@ -4,20 +4,20 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 
 data class MolbioV2ResultData(
     val age: Int? = 0,
-    val analysisDate: String? = "2024-02-08 16:33:56",
+    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? = "2024-02-08 16:33:56",
+    val collectionTime: String? = "",
     val collector: String? = "",
     val createdAt: String? = "",
     val createdBy: Int? = 0,
     val curveFitting: String? = "",
     val deviceId: Int? = 0,
-    val expiryTime: String? = "2024-02-08 16:33:56",
+    val expiryTime: String? = "",
     val gender: String? = "",
     val id: Int? = 0,
     val interpretation: String? = "",
@@ -32,11 +32,11 @@ data class MolbioV2ResultData(
     val testId: String? = "",
     val testResult: String? = "",
     val testStatus: String? = "",
-    val testTime: String? = "2024-02-08 16:33:56",
+    val testTime: String? = "",
     val testType: String? = "",
     val thresholds: String? = "",
     val underMedication: Boolean? = false,
     val updatedAt: String? = "",
     val updatedBy: Int? = 0,
-    val volume: Int? = 0,
+    val volume: Int? = 0
 )

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

@@ -1,5 +1,5 @@
 package com.example.hpostesting.data.model.molbioresult
 
 data class MolbioV2ResultRequest(
-    val results: MutableList<MolbioV2Result>? = mutableListOf(),
+    val results: MutableList<MolbioV2Result>? = mutableListOf()
 )

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

@@ -8,5 +8,5 @@ data class MolbioV2ResultResponse(
     @SerializedName("Message")
     val message: String? = "",
     @SerializedName("Result")
-    val result: String? = "",
+    val result: String? = ""
 )

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

@@ -19,7 +19,7 @@ data class RawData(
     var gender: String = "",
     var localFlag: Boolean = false,
     var deviceId: String? = "",
-    var appVersion: String? = "",
+    var appVersion:String? = "",
     var deviceSerialNumber: String = "",
     var deviceType: String = "HEMOCUBE",
     var kitSerial: String = "",

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

@@ -9,7 +9,7 @@ data class BufferCheckData(
     var _id: String = "",
     var kitno: String = "",
     var deviceId: String? = "",
-    var appVersion: String? = "",
+    var appVersion:String? = "",
     var deviceSerialNumber: String = "",
     var deviceType: String = "HEMOCUBE",
     var localFlag: Boolean = false,

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

@@ -15,25 +15,5 @@ data class DeviceData(
     @get:PropertyName("coefficients") @set:PropertyName("coefficients")
     var coefficients: List<Double> = emptyList(),
     @get:PropertyName("calibratedAt") @set:PropertyName("calibratedAt")
-    var calibratedAt: String = "",
+    var calibratedAt: String = ""
-    @get:PropertyName("deviceProvisionResponse") @set:PropertyName("deviceProvisionResponse")
-    var deviceProvisionResponse: String = "",
-    @get:PropertyName("username") @set:PropertyName("username")
-    var username: String = "",
-    @get:PropertyName("password") @set:PropertyName("password")
-    var password: String = "",
-    @get:PropertyName("natsToken") @set:PropertyName("natsToken")
-    var natsToken: String = "",
-    @get:PropertyName("natsTokenExpiry") @set:PropertyName("natsTokenExpiry")
-    var natsTokenExpiry: String = "",
-    @get:PropertyName("deviceUpdateAvailable") @set:PropertyName("deviceUpdateAvailable")
-    var deviceUpdateAvailable: Boolean = false,
-    @get:PropertyName("updatePath") @set:PropertyName("updatePath")
-    var updatePath: String = "",
-    @get:PropertyName("deviceVersion") @set:PropertyName("deviceVersion")
-    var deviceVersion: String = "",
-    @get:PropertyName("globalUpdateDone") @set:PropertyName("globalUpdateDone")
-    var globalUpdateDone: Boolean = false,
-    @get:PropertyName("globalUpdateIgnore") @set:PropertyName("globalUpdateIgnore")
-    var globalUpdateIgnore: Boolean = false,
 )

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

@@ -22,7 +22,7 @@ data class HemoCubeTestData(
     var gender: String = "",
     var localFlag: Boolean = false,
     var deviceId: String? = "",
-    var appVersion: String? = "",
+    var appVersion:String? = "",
     var deviceSerialNumber: String = "",
     var deviceType: String = "HEMOCUBE",
     var kitSerial: String = "",
@@ -78,7 +78,6 @@ data class HemoCubeTestData(
     var prdClassification: String = "",
     var deviceRatioClass: String = "",
     var slopeRatioClass: String = "",
-    var borderlineMethod2Class: String = "",
     var errorMessages: String = "",
     var batteryLevel: String = "",
     var batteryCapacity: String = "",
@@ -90,5 +89,5 @@ data class HemoCubeTestData(
     var solution: String? = "",
     var concentration: String? = "",
     var volume: String? = "",
-    var isCSVCreated: Boolean = false,
+    var isCSVCreated: Boolean = false
 )

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

@@ -18,7 +18,7 @@ data class PatientDetails(
     var address: Address?,
     var category: Category?,
     var registerDate: Date?,
-    var uploadDate: Date?,
+    var uploadDate: Date?
 ) {
     constructor() : this(
         "",
@@ -45,6 +45,7 @@ data class PatientDetails(
         OTHER
     }
 
+
     data class Address(
         var house: String?,
         val street: String?,

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

@@ -29,7 +29,7 @@ data class UserData(
     var reportPath: String = "",
     var result: TestRightResultType? = null,
     var resultRatio: Double? = null,
-    var prdClassification: String = "",
+    var prdClassification: String = ""
 ) {
     enum class Gender {
         MALE,
@@ -39,7 +39,7 @@ data class UserData(
 
     data class Location(
         var latitude: Double? = null,
-        var longitude: Double? = null,
+        var longitude: Double? = null
     )
 }
 

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

@@ -0,0 +1,29 @@
+package com.example.hpostesting.di
+
+import android.content.Context
+import com.example.hpostesting.data.repository.DatabaseRepository
+import com.example.hpostesting.data.dao.UserDao
+import com.example.hpostesting.domain.SaveRawData
+import com.example.hpostesting.domain.SaveRawDataTest
+import com.example.hpostesting.presentation.testRight.TestRightViewModel
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
+
+@Module
+@InstallIn(ViewModelComponent::class)
+object ViewModelModule {
+
+    @Provides
+    fun provideTestRightViewModel(
+        saveRawData: SaveRawData,
+        saveRawDataTest: SaveRawDataTest,
+        databaseRepository: DatabaseRepository,
+        userDao: UserDao,
+        context: Context
+    ): TestRightViewModel {
+        return TestRightViewModel(saveRawData, saveRawDataTest, databaseRepository, userDao, context)
+    }
+}

app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt

@@ -1,5 +1,5 @@
 package com.example.hpostesting.data.model.updates
 
 data class CheckUpdateData(
-    val version: String? = "",
+    val version: String? = ""
 )

app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt

@@ -1,5 +1,5 @@
 package com.example.hpostesting.data.model.updates
 
 data class CheckUpdateRequest(
-    val currentVersion: String? = "",
+    val currentVersion: String? = ""
 )

app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt

@@ -8,5 +8,5 @@ data class CheckUpdateResponse(
     @SerializedName("Message")
     val message: String? = "",
     @SerializedName("Result")
-    val result: String? = "",
+    val result: String? = ""
 )

app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt

@@ -1,5 +1,5 @@
 package com.example.hpostesting.data.model.updates
 
 data class DeviceUpdateRequest(
-    val serial_no: String? = "",
+    val serial_no: String? = ""
 )

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

@@ -6,12 +6,9 @@ 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.devicediagnostics.DeviceDiagnosticsRequest
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 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.jig.JigData
 import com.example.hpostesting.data.model.log.UploadLogsResponse
 import com.example.hpostesting.data.model.login.LoginRequest
 import com.example.hpostesting.data.model.login.LoginResponse
@@ -40,8 +37,8 @@ import javax.inject.Named
 
 class NetworkException(message: String, cause: Throwable) : Exception(message, cause)
 class DatabaseRepository @Inject constructor(
-    @Named("Auth") private val molbioAuthApi: MolbioAuthApi,
+    @Named("Auth")private val molbioAuthApi: MolbioAuthApi,
-    private val molbioResultApi: MolbioResultApi,
+    private val molbioResultApi: MolbioResultApi
 ) : Repository {
 
     private val db: FirebaseFirestore = Firebase.firestore
@@ -80,14 +77,9 @@ class DatabaseRepository @Inject constructor(
         return safeApiCall { molbioResultApi.deviceUpdate(deviceUpdateRequest) }
     }
 
-    override suspend fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest): Result<DeviceDiagnosticsResponse> {
-        return safeApiCall { molbioResultApi.deviceDiagnostics(deviceDiagnosticsRequest) }
-    }
-
     override suspend fun downloadClientCertificate(): Result<ResponseBody> {
         return safeApiCall { molbioResultApi.downloadClientCertificate() }
     }
-
     override suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse> {
         return safeApiCall { molbioResultApi.uploadLogs(logFile) }
     }
@@ -145,18 +137,8 @@ class DatabaseRepository @Inject constructor(
         }
     }
 
-    override suspend fun addTestJigData(data: JigData?): Response<String> {
-        return try {
-            db.collection("jigs").add(data!!).await()
-            Response.Success(data.deviceId)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
     override suspend fun uploadFileToStorage(
-        patientID: String, filePath: String,
+        patientID: String, filePath: String
     ): Response<Boolean> {
         try {
 
@@ -224,26 +206,6 @@ class DatabaseRepository @Inject constructor(
         return allDeviceDataList.find { it.deviceId == deviceId }
     }
 
-    override suspend fun getDeviceResponse(data: DeviceData?): Response<String> {
-        return try {
-            db.collection("devices").add(data!!).await()
-            Response.Success(data.deviceProvisionResponse)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
-    override suspend fun uploadDeviceId(data: DeviceData): Response<String>? {
-        return try {
-            db.collection("devices").add(data!!).await()
-            Response.Success(data.deviceId)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
     override fun <UserData> addTestToDatabase(testDetails: UserData): Any {
         TODO("Not yet implemented")
     }

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

@@ -2,12 +2,9 @@ package com.example.hpostesting.data.repository
 
 import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 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.jig.JigData
 import com.example.hpostesting.data.model.log.UploadLogsResponse
 import com.example.hpostesting.data.model.login.LoginRequest
 import com.example.hpostesting.data.model.login.LoginResponse
@@ -32,13 +29,9 @@ interface Repository {
 
     suspend fun addDiagnostics(data: DiagnosticsData?): Response<String>
 
-    suspend fun addTestJigData(data: JigData?): Response<String>
-
     suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean>
 
     suspend fun getDeviceDataById(deviceId: String): DeviceData?
-    suspend fun getDeviceResponse(data: DeviceData?): Response<String>
-    suspend fun uploadDeviceId(data: DeviceData): Response<String>?
     abstract fun <UserData> addTestToDatabase(testDetails: UserData): Any
 //    suspend fun addToDatabase(data: PatientDetails)
 
@@ -51,7 +44,7 @@ interface Repository {
     suspend fun checkUpdate(checkUpdateRequest: CheckUpdateRequest): Result<CheckUpdateResponse>
 
     suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody>
-    suspend fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest): Result<DeviceDiagnosticsResponse>
+
     suspend fun downloadClientCertificate(): Result<ResponseBody>
     suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse>
 }

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

@@ -1,10 +1,10 @@
 package com.example.hpostesting.domain
 
 import android.util.Log
+import com.example.hpostesting.data.repository.LocalFileRepository
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestRightCalculationData
-import com.example.hpostesting.data.repository.LocalFileRepository
 import java.util.Collections.sort
 
 class SaveRawData(private val localFileRepository: LocalFileRepository) {
@@ -98,7 +98,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
         folderPath: String,
         fileName: String,
         calculationData: TestRightCalculationData,
-        testDetails: UserData?,
+        testDetails: UserData?
     ) {
 //        val fileObj = File(folderPath, fileName)
 //        val writer = FileWriter(fileObj)
@@ -116,7 +116,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
 
     private fun getLogStringFromObjWithPatientData(
         calculationData: TestRightCalculationData,
-        testDetails: UserData?,
+        testDetails: UserData?
     ): String {
         var outputString = "Test calculation logs ==>\n"
         outputString += "Name = ${testDetails?.name}\n"

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

@@ -22,8 +22,6 @@ import com.example.hpostesting.domain.LogFileManager
 import com.example.hpostesting.domain.LogFileManagerImpl
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.UsbServiceListenerImpl
 import com.example.hpostesting.util.PropertyProviderImpl
 import dagger.Module
 import dagger.Provides
@@ -181,10 +179,4 @@ object AppModule {
     fun provideLocalFileDataSource(): LocalFileDataSource {
         return LocalFileDataSourceImpl()
     }
-
-    @Provides
-    @Singleton
-    fun provideUsbServiceListener(context: Context): UsbServiceListener {
-        return UsbServiceListenerImpl(context)
-    }
 }

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

@@ -87,7 +87,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 
     override fun dcssdkEventAuxScannerAppeared(
         dcsScannerInfo: DCSScannerInfo?,
-        dcsScannerInfo1: DCSScannerInfo?,
+        dcsScannerInfo1: DCSScannerInfo?
     ) {
     }
 
@@ -119,6 +119,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 //            }
 //        }
 
+
         try {
             if (checkHemoCubeKitData()) {
                 DataHolder.selectedTest!!.kitSerial =
@@ -155,6 +156,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
             pullTrigger()
         }
 
+
         binding.btnGo.setOnClickListener {
             val serialNumber = binding.nameEditText.text.toString().trim()
             if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
@@ -221,12 +223,13 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
             notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
         sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
         mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList())
-        Log.e("scannersize", sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
+        Log.e("scannersize",sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
         if (mScannerInfoList.isNotEmpty()) {
             sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
         } else {
-            Toast.makeText(this,"Scanner Is not available In this device", Toast.LENGTH_LONG).show()
+            Toast.makeText(this,"Error", Toast.LENGTH_LONG).show()
         }
+
     }
 
     private fun pullTrigger() {
@@ -240,10 +243,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
             val outXML = StringBuilder()
             val result: DCSSDK_RESULT =
                 sdkHandler!!.dcssdkExecuteCommandOpCodeInXMLForScanner(
-                    DCSSDK_COMMAND_OPCODE.DCSSDK_DEVICE_PULL_TRIGGER,
+                    DCSSDK_COMMAND_OPCODE.DCSSDK_DEVICE_PULL_TRIGGER, inXML, outXML, mScannerInfoList[0].scannerID // Ensure you're using the correct scanner ID
-                    inXML,
-                    outXML,
-                    mScannerInfoList[0].scannerID // Ensure you're using the correct scanner ID
                 )
             if (result == DCSSDK_RESULT.DCSSDK_RESULT_SUCCESS) {
                 Log.d("Scanning", "Success")
@@ -256,6 +256,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         }
     }
 
+
     //this function is called if barcode is detected.
     override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) {
         val result = String(barcodeData!!)
@@ -270,7 +271,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         return sharedPreference.getString(Constants.KIT_NUMBER, "")
             ?.isNotBlank() == true && sharedPreference.getInt(
             Constants.KIT_COUNT, 0
-        ) > 0 && sharedPreference.getInt(Constants.KIT_COUNT, 0) < Constants.KIT_CAPACITY
+        ) > 0 && sharedPreference.getInt(Constants.KIT_COUNT, 0) < 35
     }
 
     private fun isSerialValid(s: String): Boolean {

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

@@ -111,11 +111,7 @@ class MainActivity : AppCompatActivity() {
         val deviceType = when {
             availableDrivers.isNotEmpty() -> {
                 val device = availableDrivers[0].device
-                Toast.makeText(
+                Toast.makeText(this, "Connected, productId: ${device.productId}, vendorId: ${device.vendorId}", Toast.LENGTH_SHORT).show()
-                    this,
-                    "Connected, productId: ${device.productId}, vendorId: ${device.vendorId}",
-                    Toast.LENGTH_SHORT
-                ).show()
                 when {
                     device.productId == Constants.HOMO_CUBE_ID && device.vendorId == Constants.VENDOR_ID -> {
                         binding.cvItem1.visibility = View.VISIBLE
@@ -153,15 +149,6 @@ class MainActivity : AppCompatActivity() {
                         Constants.DEVICE_TYPE_HEMOCUBE
                     }
 
-                    device.productId == 4614 && device.vendorId == 7111 -> {
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.VISIBLE
-                        binding.cvItem2.visibility = View.GONE
-                        binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
-                        Constants.DEVICE_TYPE_HEMOCUBE
-                    }
-
                     device.productId == Constants.DEVICE_PRODUCT_ID && device.vendorId == Constants.DEVICE_VENDOR_ID -> {
                         Log.d(
                             TAG,
@@ -352,7 +339,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onRequestPermissionsResult(
-        requestCode: Int, permissions: Array<String>, grantResults: IntArray,
+        requestCode: Int, permissions: Array<String>, grantResults: IntArray
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         when (requestCode) {

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

@@ -1,10 +1,9 @@
 package com.example.hpostesting.presentation
 
-import android.content.Context
 import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
-import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.presentation.assurance.AssuranceControlsActivity
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import io.nats.client.AuthHandler
 import io.nats.client.Connection
@@ -13,15 +12,20 @@ import io.nats.client.NKey
 import io.nats.client.Nats
 import io.nats.client.Options
 import io.nats.client.support.SSLUtils
+import java.io.BufferedInputStream
+import java.io.File
 import java.io.FileInputStream
 import java.io.IOException
 import java.nio.charset.StandardCharsets
+import java.nio.file.Paths
 import java.security.GeneralSecurityException
 import java.security.KeyStore
 import java.security.SecureRandom
 import java.security.cert.CertificateFactory
+import javax.net.ssl.KeyManager
 import javax.net.ssl.KeyManagerFactory
 import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManager
 import javax.net.ssl.TrustManagerFactory
 
 
@@ -31,7 +35,6 @@ class NatsManager(datacollector: DashboardActivity) {
     var nc: Connection? = null
     val datacollector = datacollector
     var connect = false
-    var sharedPreferences = datacollector.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
 
     private fun createSSLContext(): SSLContext {
         val keyStorePassword = "prime24".toCharArray() // Change as necessary
@@ -42,8 +45,7 @@ class NatsManager(datacollector: DashboardActivity) {
         FileInputStream(clientCertPath).use { keyStoreInputStream ->
             keyStore.load(keyStoreInputStream, keyStorePassword)
         }
-        val caCertPath =
+        val caCertPath = "/storage/sdcard0/Android/data/in.sminnovations.hpostesting.quality/files/NATS/clientCertificate/client-cert.pem"
-            "/storage/sdcard0/Android/data/in.sminnovations.hpostesting.quality/files/NATS/clientCertificate/client-cert.pem"
         val caCert = FileInputStream(caCertPath).use { inputStream ->
             val certificateFactory = CertificateFactory.getInstance("X.509")
             certificateFactory.generateCertificate(inputStream)
@@ -69,18 +71,16 @@ class NatsManager(datacollector: DashboardActivity) {
         return sslContext
     }
 
+
+
     @RequiresApi(Build.VERSION_CODES.O)
     fun connect() {
         Log.d(TAG, "TRY TO CONNECT")
         Thread {
 
-            try {
+            val seedString = "SUAJH5VMO6GDRQA6QTXCLIJMS74IWIUTU3NJVYIOTZF2LBWUPD77DA2ZEA"
-
+            Log.e("seedString",seedString)
-                val seedString = sharedPreferences.getString(Constants.NATS_TOKEN, "")
+            val seedBytes = seedString.toCharArray()
-                val deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
-                Log.e("seedString", seedString.toString())
-                Log.d("nats deviceId", deviceId.toString())
-                val seedBytes = seedString?.toCharArray()
 
             val theNKey = NKey.fromSeed(seedBytes) // really should load from somewhere
 
@@ -118,66 +118,60 @@ class NatsManager(datacollector: DashboardActivity) {
                 })
                 .build()
 
+            try {
                 nc = Nats.connect(options)
                 Log.d(TAG, "Connected to Nats server ${options.servers.first()}")
                 connect = true
                 datacollector.setConnect(true)
 
                 if (nc?.status == Connection.Status.CONNECTED) {
-                    Log.d("NATSCONNECTION", "NATS is successfully connected.")
+                    Log.e("NATSCONNECTION", "NATS is successfully connected.")
-                    nc?.subscribe("device.hpos.${deviceId}.ping")
-                   // Log.d(TAG, "Nats subscribed with ping-"+d)
-                    nc?.publish(
-                        "server.hpos.${deviceId}.ping",
-                        "ALIVE".toByteArray(StandardCharsets.UTF_8)
-                    )
-                    nc?.publish(
-                        "server.hpos.${deviceId}.health",
-                        "ALIVE".toByteArray(StandardCharsets.UTF_8)
-                    )
-                    val d = nc?.createDispatcher { msg: Message? ->
-                        println("Nats dispatcher $msg")
-                        Log.d(TAG, "Nats dispatcher--$msg")
-                    }
-                    d?.subscribe("device.hpos.${deviceId}.ping") { msg ->
-                        val response = String(msg.data, StandardCharsets.UTF_8)
-                        datacollector.setResponse(response)
-                        println("Message received (up to 100 times): $response")
-                        Log.d(TAG, "subscribed msg ${msg} on topic ping")
-                    }
-
-                    d?.subscribe("device.hpos.${deviceId}.update") { msg ->
-                        val response = String(msg.data, StandardCharsets.UTF_8)
-                        datacollector.setResponse(response)
-                        println("Message received (up to 100 times): $response")
-                    }
-
-                    d?.subscribe("device.hpos.${deviceId}.uploadlogs") { msg ->
-                        val response = String(msg.data, StandardCharsets.UTF_8)
-                        datacollector.setResponse(response + "UPLOAD")
-                        println("Message received (up to 100 times): $response")
-                    }
-
-                    d?.subscribe("device.hpos.${deviceId}.disable") { msg ->
-                        val response = String(msg.data, StandardCharsets.UTF_8)
-                        datacollector.setResponse(response)
-                        println("Message received (up to 100 times): $response")
-                    }
-
-                    d?.subscribe("device.hpos.${deviceId}.updatecustomer") { msg ->
-                        val response = String(msg.data, StandardCharsets.UTF_8)
-                        datacollector.setResponse(response)
-                        println("Message received (up to 100 times): $response")
-                    }
-
-                    d?.subscribe("device.hpos.${deviceId}.checkUpdate") { msg ->
-                        val response = String(msg.data, StandardCharsets.UTF_8)
-                        datacollector.setResponse(response)
-                        println("Message received (up to 100 times) on topic checkupdate: $response")
-                        Log.d(TAG, "subscribed msg ${msg} on topic checkupdate")
-                    }
                 } else {
-                    Log.d("NATSCONNECTION", "NATS is not connected. Current status: ${nc?.status}")
+                    Log.e("NATSCONNECTION", "NATS is not connected. Current status: ${nc?.status}")
+                }
+
+                nc?.publish(
+                    "server.hpos.HCV-000-3001.ping",
+                    "ALIVE".toByteArray(StandardCharsets.UTF_8)
+                )
+                nc?.publish(
+                    "server.hpos.HCV-000-3001.health",
+                    "ALIVE".toByteArray(StandardCharsets.UTF_8)
+                )
+                Log.d(TAG, "Published msg server.hpos.HCV-000-3001.ping on topic Testing")
+                val d = nc?.createDispatcher { msg: Message? ->
+                    println("PRITIMOI SARKAR $msg")
+                }
+
+
+                d?.subscribe("device.hpos.HCV-000-3001.update") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response)
+                    println("Message received (up to 100 times): $response")
+                }
+
+                d?.subscribe("device.hpos.HCV-000-3001.uploadlogs") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response + "uPLOAD")
+                    println("Message received (up to 100 times): $response")
+                }
+
+                d?.subscribe("device.hpos.HCV-000-3001.disable") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response)
+                    println("Message received (up to 100 times): $response")
+                }
+
+                d?.subscribe("device.hpos.HCV-000-3001.updatecustomer") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response)
+                    println("Message received (up to 100 times): $response")
+                }
+
+                d?.subscribe("device.hpos.HCV-000-3001.checkupdate") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response)
+                    println("Message received (up to 100 times): $response")
                 }
 
             } catch (exp: Exception) {
@@ -194,16 +188,6 @@ class NatsManager(datacollector: DashboardActivity) {
         Log.d(TAG, "Published msg ${msg} on topic ${topic}")
     }
 
-    fun sub(topic: String) {
-        val d = nc?.createDispatcher { msg: Message? ->
-            val response = String(msg?.data ?: ByteArray(0), StandardCharsets.UTF_8)
-            datacollector.onMessageReceived(topic, response)
-            Log.d(TAG, "Subscribed msg $msg on topic $topic")
-        }
-
-        d?.subscribe(topic)
-    }
-
     fun close() {
         nc?.close()
         Log.d(TAG, "Nats connection close")

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

@@ -1,5 +1,6 @@
 package com.example.hpostesting.presentation
 
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.Manifest
 import android.content.Context
 import android.content.Intent
@@ -15,7 +16,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.util.MyUtils
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivitySplashBinding
@@ -53,10 +53,7 @@ class SplashActivity : AppCompatActivity() {
 
     private fun setupStaticConstants() {
         DataHolder.mobileUniqueId =
-            Settings.Secure.getString(
+            Settings.Secure.getString(applicationContext.contentResolver, Settings.Secure.ANDROID_ID)
-                applicationContext.contentResolver,
-                Settings.Secure.ANDROID_ID
-            )
     }
 
 //    private fun setupFirestoreCache() {
@@ -101,10 +98,7 @@ class SplashActivity : AppCompatActivity() {
     private fun requestPermissionsBelowAndroidR() {
         val permissionsToRequest = requiredPermissions
             .filterNot { permission ->
-                ContextCompat.checkSelfPermission(
+                ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED
-                    this,
-                    permission
-                ) == PackageManager.PERMISSION_GRANTED
             }
             .toTypedArray()
 
@@ -120,18 +114,9 @@ class SplashActivity : AppCompatActivity() {
         val coarseLocationPermission = Manifest.permission.ACCESS_COARSE_LOCATION
         val cameraPermission = Manifest.permission.CAMERA
         val locationPermissionsGranted =
-            ContextCompat.checkSelfPermission(
+            ContextCompat.checkSelfPermission(this, fineLocationPermission) == PackageManager.PERMISSION_GRANTED &&
-                this,
+                    ContextCompat.checkSelfPermission(this, coarseLocationPermission) == PackageManager.PERMISSION_GRANTED
-                fineLocationPermission
+        val cameraPermissionGranted = ContextCompat.checkSelfPermission(this, cameraPermission) == PackageManager.PERMISSION_GRANTED
-            ) == PackageManager.PERMISSION_GRANTED &&
-                    ContextCompat.checkSelfPermission(
-                        this,
-                        coarseLocationPermission
-                    ) == PackageManager.PERMISSION_GRANTED
-        val cameraPermissionGranted = ContextCompat.checkSelfPermission(
-            this,
-            cameraPermission
-        ) == PackageManager.PERMISSION_GRANTED
 
         if (locationPermissionsGranted && cameraPermissionGranted) {
             handlePermissionsResult(true)

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

@@ -1,26 +0,0 @@
-package com.example.hpostesting.presentation
-
-import android.content.Context
-import android.util.Log
-import android.widget.Toast
-
-class UsbServiceListenerImpl(private val context: Context): UsbServiceListener {
-    override fun onUsbRead(data: ByteArray?) {
-        if (data != null) {
-            val receivedData = String(data)
-            logData(receivedData)
-        }
-    }
-
-    override fun onUsbError(e: Exception?) {
-        showToast("USB Error: ${e?.message}")
-    }
-
-    private fun showToast(message: String) {
-        Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
-    }
-
-    private fun logData(data: String) {
-        Log.d("UsbServiceListener", "Received data from USB: $data")
-    }
-}

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

@@ -17,11 +17,13 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.OfflineUserListViewBinding
+import org.apache.commons.collections4.MapUtils.getString
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
 
+
 class OfflineUserListAdapter(private val view: View, private val batLevel: Int) :
     RecyclerView.Adapter<OfflineUserListAdapter.OfflineUserListViewHolder>() {
 
@@ -31,13 +33,13 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
 
     private val differCallback = object : DiffUtil.ItemCallback<HemoCubeTestData>() {
         override fun areItemsTheSame(
-            oldItem: HemoCubeTestData, newItem: HemoCubeTestData,
+            oldItem: HemoCubeTestData, newItem: HemoCubeTestData
         ): Boolean {
             return oldItem._id == newItem._id
         }
 
         override fun areContentsTheSame(
-            oldItem: HemoCubeTestData, newItem: HemoCubeTestData,
+            oldItem: HemoCubeTestData, newItem: HemoCubeTestData
         ): Boolean {
             return oldItem == newItem
         }
@@ -141,6 +143,7 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
         return diffMillis / (60 * 1000)
     }
 
+
     private fun showWarningToast(resId: Int) {
         val contextToUse = view.context ?: return
 

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

@@ -4,28 +4,30 @@ import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Context
 import android.content.Context.INPUT_METHOD_SERVICE
+import android.view.inputmethod.InputMethodManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
-import android.widget.AutoCompleteTextView
 import android.widget.Toast
-import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
-import com.google.firebase.firestore.FirebaseFirestore
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.UserItemViewBinding
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
+import android.widget.AutoCompleteTextView
+import androidx.core.content.ContextCompat.getSystemService
+import androidx.core.content.getSystemService
+import androidx.fragment.app.FragmentActivity
+import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.google.firebase.firestore.FirebaseFirestore
 
 class UserListAdapter(
 
@@ -34,7 +36,7 @@ class UserListAdapter(
     options: FirestoreRecyclerOptions<UserData>,
     private val view: View,
     private val batLevel: Int,
-    private val requireActivity: FragmentActivity,
+    private val requireActivity: FragmentActivity
 ) : FirestoreRecyclerAdapter<UserData, UserListAdapter.OrderItemViewHolder>(options) {
 
     class OrderItemViewHolder(val binding: UserItemViewBinding) :
@@ -94,21 +96,16 @@ class UserListAdapter(
                     .setView(dialogView)
                     .setTitle(R.string.blood_group)
 
-                val etBloodGroup =
+                val etBloodGroup = dialogView.findViewById<AutoCompleteTextView>(R.id.et_blood_group)
-                    dialogView.findViewById<AutoCompleteTextView>(R.id.et_blood_group)
 
                 builder.setPositiveButton(R.string.ok) { dialog, which ->
                     val bloodGroup = etBloodGroup.text.toString()
-                    if (bloodGroup.equals("Select Blood Group") || bloodGroup.equals("ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ") || bloodGroup.isNullOrBlank()) {
+                    if (bloodGroup.equals("Select Blood Group") ||bloodGroup.equals("ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ") || bloodGroup.isNullOrBlank()) {
                         if (view != null) {
-                            etBloodGroup.error = view.context.getString(R.string.blood_group_error)
+                            etBloodGroup.error =view.context.getString(R.string.blood_group_error)
                         }
                         if (view != null) {
-                            Toast.makeText(
+                            Toast.makeText(context, view.context.getString(R.string.blood_group_toast), Toast.LENGTH_SHORT).show()
-                                context,
-                                view.context.getString(R.string.blood_group_toast),
-                                Toast.LENGTH_SHORT
-                            ).show()
                         }
                     } else {
                         // Check if hemoCubeViewModel and testDetails are not null
@@ -122,8 +119,7 @@ class UserListAdapter(
                                     val document = userdata.documents[0]
                                     db.collection("patientData")
                                         .document(document.id)
-                                        .update(
+                                        .update("bloodGroup", bloodGroup,
-                                            "bloodGroup", bloodGroup,
                                             "incubationTime", SimpleDateFormat(
                                                 "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                                             ).format(Calendar.getInstance().time).toString()

app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsActivity.kt

@@ -3,14 +3,19 @@ package com.example.hpostesting.presentation.assurance
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
+import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
+import com.example.hpostesting.presentation.NatsManager
+import com.example.hpostesting.presentation.dashboard.IDataCollector
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.databinding.ActivityAssuranceControlsBinding
 
 @AndroidEntryPoint
-class AssuranceControlsActivity : AppCompatActivity() {
+class AssuranceControlsActivity: AppCompatActivity(), IDataCollector {
     lateinit var binding: ActivityAssuranceControlsBinding
     lateinit var sharedPreference: SharedPreferences
+    lateinit var nats: NatsManager
+    var responses: String = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -24,5 +29,21 @@ class AssuranceControlsActivity : AppCompatActivity() {
                 .replace(binding.fgAssuranceControls.id, AssuranceControlsFragment())
                 .commit()
         }
+
+//        nats = NatsManager(this)
+//        nats.connect()
+//        nats.pub("server.hpos.HCV-000-3001.ping", "THIS IS A TEST MSG")
+    }
+
+    override fun setConnect(connect: Boolean) {
+        if(connect){
+            Log.i("NATS Connection", connect.toString())
+        }
+    }
+
+    override fun setResponse(response: String) {
+
+        responses = responses+response+"\n"
+        println(responses)
     }
 }

app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt

@@ -13,7 +13,6 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Spinner
 import android.widget.Toast
-import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
@@ -22,7 +21,7 @@ import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import `in`.sminnovations.hpostesting.databinding.FragmentAssuranceControlsBinding
 import java.time.Instant
 
-class AssuranceControlsFragment : Fragment() {
+class AssuranceControlsFragment: Fragment() {
     lateinit var binding: FragmentAssuranceControlsBinding
     private lateinit var sharedPreferences: SharedPreferences
 
@@ -48,8 +47,7 @@ class AssuranceControlsFragment : Fragment() {
 
         val solutionSpinner: Spinner = binding.spinnerSolutions
         val solutionOptions = arrayOf("Select solution", "Tartrazine", "Acid Red")
-        val solutionAdapter =
+        val solutionAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions)
-            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions)
         solutionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         solutionSpinner.adapter = solutionAdapter
         solutionSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -57,7 +55,7 @@ class AssuranceControlsFragment : Fragment() {
                 parent: AdapterView<*>?,
                 view: View?,
                 position: Int,
-                id: Long,
+                id: Long
             ) {
                 val selectedValue: String = solutionOptions[position]
                 if (!selectedValue.equals("Select solution")) {
@@ -70,21 +68,8 @@ class AssuranceControlsFragment : Fragment() {
         }
 
         val concentrationSpinner: Spinner = binding.spinnerConcentration
-        val concentrationOptions = arrayOf(
+        val concentrationOptions = arrayOf("Select concentration", "65umol", "45umol", "22.5umol", "12.25umol", "6.125umol", "75umol", "50umol", "25umol", "12.5umol", "6.25umol")
-            "Select concentration",
+        val concentrationAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, concentrationOptions)
-            "65umol",
-            "45umol",
-            "22.5umol",
-            "12.25umol",
-            "6.125umol",
-            "75umol",
-            "50umol",
-            "25umol",
-            "12.5umol",
-            "6.25umol"
-        )
-        val concentrationAdapter =
-            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, concentrationOptions)
         concentrationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         concentrationSpinner.adapter = concentrationAdapter
         concentrationSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -92,7 +77,7 @@ class AssuranceControlsFragment : Fragment() {
                 parent: AdapterView<*>?,
                 view: View?,
                 position: Int,
-                id: Long,
+                id: Long
             ) {
                 val selectedValue: String = concentrationOptions[position]
                 if (!selectedValue.equals("Select concentration")) {
@@ -106,8 +91,7 @@ class AssuranceControlsFragment : Fragment() {
 
         val volumeSpinner: Spinner = binding.spinnerVolume
         val volumeOptions = arrayOf("Select volume", "1uml", "2uml", "4uml", "4.5uml", "5uml")
-        val volumeAdapter =
+        val volumeAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, volumeOptions)
-            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, volumeOptions)
         volumeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         volumeSpinner.adapter = volumeAdapter
         volumeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -115,9 +99,12 @@ class AssuranceControlsFragment : Fragment() {
                 parent: AdapterView<*>?,
                 view: View?,
                 position: Int,
-                id: Long,
+                id: Long
             ) {
                 val selectedValue: String = volumeOptions[position]
+                if (!selectedValue.equals("Select volume")) {
+                    DataHolder.hemoCubeTestData!!.volume = selectedValue
+                }
             }
 
             override fun onNothingSelected(parent: AdapterView<*>?) {
@@ -125,15 +112,12 @@ class AssuranceControlsFragment : Fragment() {
         }
 
         // load saved values
-        val savedSolution =
+        val savedSolution = sharedPreferences.getString(Constants.QUICK_CAPTURE_SOLUTION, "").toString()
-            sharedPreferences.getString(Constants.QUICK_CAPTURE_SOLUTION, "").toString()
         val solutionPosition = getPositionOfValue(savedSolution, solutionOptions.toList())
         solutionSpinner.setSelection(solutionPosition)
 
-        val savedConcentration =
+        val savedConcentration = sharedPreferences.getString(Constants.QUICK_CAPTURE_CONCENTRATION, "").toString()
-            sharedPreferences.getString(Constants.QUICK_CAPTURE_CONCENTRATION, "").toString()
+        val concentrationPosition = getPositionOfValue(savedConcentration, concentrationOptions.toList())
-        val concentrationPosition =
-            getPositionOfValue(savedConcentration, concentrationOptions.toList())
         concentrationSpinner.setSelection(concentrationPosition)
 
         val savedVolume = sharedPreferences.getString(Constants.QUICK_CAPTURE_VOLUME, "").toString()
@@ -141,19 +125,13 @@ class AssuranceControlsFragment : Fragment() {
         volumeSpinner.setSelection(volumePosition)
 
         binding.btnSubmit.setOnClickListener {
-            val selectedSolution = binding.spinnerSolutions.selectedItem.toString()
+            val selectedSolution = DataHolder.hemoCubeTestData!!.solution
-            val selectedConcentration = binding.spinnerConcentration.selectedItem.toString()
+            val selectedVolume = DataHolder.hemoCubeTestData!!.volume
-
+            if (selectedSolution == "Select solution" || selectedVolume == "Select volume") {
-            // Check if any of the selections are default values
+                Toast.makeText(requireContext(), "Please select both solution and volume", Toast.LENGTH_SHORT).show()
-            if (selectedSolution == "Select solution") {
+                return@setOnClickListener
-                Toast.makeText(requireContext(), "Please select a solution", Toast.LENGTH_LONG).show()
-                return@setOnClickListener // Prevent further execution
             }
 
-            if (selectedConcentration == "Select concentration") {
-                Toast.makeText(requireContext(), "Please select a concentration", Toast.LENGTH_LONG).show()
-                return@setOnClickListener // Prevent further execution
-            }
             DataHolder.hemoCubeTestData!!.quickCapture = true
             val currentUnixTime = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 Instant.now().epochSecond
@@ -161,8 +139,6 @@ class AssuranceControlsFragment : Fragment() {
                 ""
             }
             DataHolder.hemoCubeTestData!!._id = currentUnixTime.toString() + "SMI"
-            DataHolder.hemoCubeTestData!!.solution = binding.spinnerSolutions.selectedItem.toString()
-            DataHolder.hemoCubeTestData!!.concentration = binding.spinnerConcentration.selectedItem.toString()
             DataHolder.hemoCubeTestData!!.name = "${DataHolder.hemoCubeTestData!!.solution} ${DataHolder.hemoCubeTestData!!.concentration} ${DataHolder.hemoCubeTestData!!.volume}"
 
             DataHolder.selectedTest = UserData()
@@ -171,10 +147,7 @@ class AssuranceControlsFragment : Fragment() {
 
             with(sharedPreferences.edit()) {
                 putString(Constants.QUICK_CAPTURE_SOLUTION, DataHolder.hemoCubeTestData!!.solution)
-                putString(
+                putString(Constants.QUICK_CAPTURE_CONCENTRATION, DataHolder.hemoCubeTestData!!.concentration)
-                    Constants.QUICK_CAPTURE_CONCENTRATION,
-                    DataHolder.hemoCubeTestData!!.concentration
-                )
                 putString(Constants.QUICK_CAPTURE_VOLUME, DataHolder.hemoCubeTestData!!.volume)
                 apply()
             }

app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacActivity.kt

@@ -31,7 +31,7 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityAutoDacBinding
 
 @AndroidEntryPoint
-class AutoDacActivity : AppCompatActivity() {
+class AutoDacActivity: AppCompatActivity()  {
     private lateinit var binding: ActivityAutoDacBinding
     val viewModel: AutoDacViewModel by viewModels()
     private var myMenu: Menu? = null
@@ -58,9 +58,11 @@ class AutoDacActivity : AppCompatActivity() {
                     DataHolder.usbConnected.postValue(true)
                 }
             }
+
         }
     }
 
+
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as UsbService.UsbServiceBinder
@@ -105,7 +107,6 @@ class AutoDacActivity : AppCompatActivity() {
             }
         }
     }
-
     open fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
@@ -125,6 +126,7 @@ class AutoDacActivity : AppCompatActivity() {
         }
     }
 
+
     fun onErrorReported(msg: String) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
         if (!isFinishing) onBackPressed()
@@ -159,16 +161,17 @@ class AutoDacActivity : AppCompatActivity() {
         manager.requestPermission(device, mPendingIntent)
     }
 
+
     fun setupService() {
         val intent = Intent(this, UsbService::class.java)
         bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
 
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.my_menu, menu)
         return true
     }
-
     override fun onDestroy() {
         super.onDestroy()
         if (viewModel.isServiceConnected) {

app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt

@@ -22,7 +22,7 @@ import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
 
-class AutoDacFragment : Fragment() {
+class AutoDacFragment: Fragment() {
 
     private lateinit var binding: FragmentAutoDacBinding
     private val autoDacViewModel: AutoDacViewModel by activityViewModels()
@@ -47,6 +47,7 @@ class AutoDacFragment : Fragment() {
         observeViewModel()
     }
 
+
     private fun initViews() {
         binding.btnSubmit.visibility = View.GONE
         listenToHemoCube()
@@ -55,12 +56,9 @@ class AutoDacFragment : Fragment() {
             binding.btnSubmit.visibility = View.GONE
             runAutoDacCommand()
         }
-        binding.btnReadDac.setOnClickListener {
-            binding.btnReadDac.visibility = View.GONE
-            readCurrentDACValuesCommand()
-        }
     }
 
+
     private fun observeViewModel() {
 
         autoDacViewModel.deviceData.observe(viewLifecycleOwner) {
@@ -95,7 +93,6 @@ class AutoDacFragment : Fragment() {
                         binding.tvSubtitle4.text = stringData
                     }
                 }
-
                 override fun onUsbError(e: Exception?) {
                     autoDacViewModel.progressBar.postValue(false)
                 }
@@ -109,35 +106,6 @@ class AutoDacFragment : Fragment() {
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
                 }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-    private fun setAutoDacValuesCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.SET_AUTO_DAC_TO_EPROM_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-    private fun readCurrentDACValuesCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.READ_DAC_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
                 override fun onUsbError(e: Exception?) {
                     autoDacViewModel.progressBar.postValue(false)
                 }
@@ -163,10 +131,10 @@ class AutoDacFragment : Fragment() {
                             val slData = stringData.split(" ")
                             if (slData.size > 1) {
                                 val hardwareId = slData[1].trim()
-//                                with(sharedPreferences.edit()) {
+                                with(sharedPreferences.edit()) {
-//                                    putString(Constants.DEVICE_ID, hardwareId)
+                                    putString(Constants.DEVICE_ID, hardwareId)
-//                                    apply()
+                                    apply()
-//                                }
+                                }
                             }
                             activity?.runOnUiThread {
                                 binding.btnSubmit.visibility = View.VISIBLE
@@ -175,24 +143,12 @@ class AutoDacFragment : Fragment() {
                     }
 
                     if (resultData.contains("#CC")) {
-                        setAutoDacValuesCommand()
-
                         autoDacViewModel.addAutoDacDataToDb(
                             DiagnosticsData(
-                                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
+                                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-                                    .toString(),
+                                devicePassword = sharedPreferences.getString(Constants.DEVICE_PASSWORD_API, "").toString(),
-                                devicePassword = sharedPreferences.getString(
+                                deviceNatsToken = sharedPreferences.getString(Constants.NATS_TOKEN, "").toString(),
-                                    Constants.DEVICE_PASSWORD_API,
+                                accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString(),
-                                    ""
-                                ).toString(),
-                                deviceNatsToken = sharedPreferences.getString(
-                                    Constants.NATS_TOKEN,
-                                    ""
-                                ).toString(),
-                                accessToken = sharedPreferences.getString(
-                                    Constants.ACCESS_TOKEN,
-                                    ""
-                                ).toString(),
                                 deviceData = resultData,
                                 runTime = SimpleDateFormat(
                                     "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
@@ -203,10 +159,6 @@ class AutoDacFragment : Fragment() {
                             binding.ivCheck.visibility = View.VISIBLE
                         }
                     }
-
-                    if (resultData.contains("#WC")) {
-                        showToast("DAC Values saved to EPROM")
-                    }
                 }
 
                 override fun onUsbError(e: Exception?) {

app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacViewModel.kt

@@ -2,9 +2,12 @@ package com.example.hpostesting.presentation.autodac
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.util.Log
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.example.hpostesting.data.NetworkStatusLiveData
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
@@ -18,7 +21,7 @@ import javax.inject.Inject
 class AutoDacViewModel  @Inject constructor(
     private val hemoCubeDao: HemoCubeDao,
     private val repository: Repository,
-    context: Context,
+    context: Context
 ) : ViewModel() {
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)

app/src/main/java/com/example/hpostesting/presentation/blank/BlankActivity.kt

@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankActivity {
-}

app/src/main/java/com/example/hpostesting/presentation/blank/BlankFragment.kt

@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankFragment {
-}

app/src/main/java/com/example/hpostesting/presentation/blank/BlankViewModel.kt

@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankViewModel {
-}

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

@@ -142,10 +142,6 @@ class HemoCubeBufferCheckFragment : Fragment() {
         hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
         }
-
-        hemoCubeViewModel.deviceMessages.observe(viewLifecycleOwner) {
-            binding.tvDeviceMessages.text = it
-        }
     }
 
     private fun checkAndStartProcess() {
@@ -179,7 +175,6 @@ class HemoCubeBufferCheckFragment : Fragment() {
         }
 
         resultData += stringData
-        hemoCubeViewModel.deviceMessages.postValue(resultData)
 
         when {
             stringData.contains("SN") -> {
@@ -206,9 +201,8 @@ class HemoCubeBufferCheckFragment : Fragment() {
             stringData.contains("#BC") -> {
                 activity?.runOnUiThread {
                     binding.tvSubtitle4.text = "Buffer Completed"
-//                    binding.btnSamplestart.visibility = View.VISIBLE
+                    binding.btnSamplestart.visibility = View.VISIBLE
                 }
-                fetchResult()
             }
 
             stringData.contains("#SS") -> {
@@ -224,9 +218,9 @@ class HemoCubeBufferCheckFragment : Fragment() {
             }
 
             resultData.contains("REND") -> {
-//                hemoCubeViewModel.messages.postValue(
+                hemoCubeViewModel.messages.postValue(
-//                    "Data collected \n" + " Processing data"
+                    "Data collected \n" + " Processing data"
-//                )
+                )
                 val resultLines = resultData.split("\\s+(?=LB|LS)".toRegex())
                 var bufferIntensity = resultLines[1].split(' ')[1].trim()
                 led1BufferForDevice = bufferIntensity.toDoubleOrNull()!!
@@ -248,7 +242,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
 
     private fun processResult() {
         try {
-//            hemoCubeViewModel.messages.postValue("processing result")
+            hemoCubeViewModel.messages.postValue("processing result")
             val deviceLog = resultData
 
             val pInfo = requireActivity().packageManager.getPackageInfo(

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

@@ -61,7 +61,6 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
 
         }
     }
-
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as UsbService.UsbServiceBinder
@@ -128,8 +127,7 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
 
     @SuppressLint("MutableImplicitPendingIntent")
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent =
+        val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
             PendingIntent.getBroadcast(
                 this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
             )
@@ -155,8 +153,7 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
     private fun moveToNext() {
         if (supportFragmentManager.isDestroyed) return
 
-        supportFragmentManager.beginTransaction()
+        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, HemoCubeBufferCheckFragment())
-            .replace(binding.fghemocube.id, HemoCubeBufferCheckFragment())
             .commit()
     }
 

app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationActivity.kt

@@ -31,7 +31,7 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityCalibrationBinding
 
 @AndroidEntryPoint
-class CalibrationActivity : AppCompatActivity() {
+class CalibrationActivity: AppCompatActivity()  {
     private lateinit var binding: ActivityCalibrationBinding
     val viewModel: CalibrationViewModel by viewModels()
     private var myMenu: Menu? = null
@@ -107,7 +107,6 @@ class CalibrationActivity : AppCompatActivity() {
             }
         }
     }
-
     open fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
@@ -137,15 +136,13 @@ class CalibrationActivity : AppCompatActivity() {
     private fun moveToNext() {
         if (supportFragmentManager.isDestroyed) return
 
-        supportFragmentManager.beginTransaction()
+        supportFragmentManager.beginTransaction().replace(binding.fgCalibration.id, CalibrationFragment())
-            .replace(binding.fgCalibration.id, CalibrationFragment())
             .commit()
     }
 
     @SuppressLint("MutableImplicitPendingIntent")
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent =
+        val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
             PendingIntent.getBroadcast(
                 this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
             )
@@ -163,16 +160,17 @@ class CalibrationActivity : AppCompatActivity() {
         manager.requestPermission(device, mPendingIntent)
     }
 
+
     fun setupService() {
         val intent = Intent(this, UsbService::class.java)
         bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
 
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.my_menu, menu)
         return true
     }
-
     override fun onDestroy() {
         super.onDestroy()
         if (viewModel.isServiceConnected) {

app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt

@@ -23,7 +23,7 @@ import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentCalibrationBinding
 
-class CalibrationFragment : Fragment() {
+class CalibrationFragment: Fragment() {
 
     private lateinit var binding: FragmentCalibrationBinding
     private val calibrationViewModel: CalibrationViewModel by activityViewModels()
@@ -50,6 +50,7 @@ class CalibrationFragment : Fragment() {
         loadSavedCalibration()
     }
 
+
     private fun initViews() {
         binding.btnSubmit.visibility = View.GONE
         listenToHemoCube()
@@ -225,7 +226,6 @@ class CalibrationFragment : Fragment() {
                         binding.tvSubtitle4.text = stringData
                     }
                 }
-
                 override fun onUsbError(e: Exception?) {
                     calibrationViewModel.progressBar.postValue(false)
                 }

app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationViewModel.kt

@@ -2,12 +2,21 @@ package com.example.hpostesting.presentation.calibration
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.util.Log
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.hpostesting.data.NetworkStatusLiveData
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.dao.HemoCubeDao
+import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.calibration.CalibrationData
+import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.repository.Repository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -21,8 +30,12 @@ class CalibrationViewModel  @Inject constructor(
     private val sharedPreference: SharedPreferences =
         context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
 
+//    private val _networkStatusLiveData = NetworkStatusLiveData(context)
     val deviceData = MutableLiveData<DeviceData?>()
+//    val networkStatusLiveData: LiveData<Boolean>
+//        get() = _networkStatusLiveData
     val fireBaseUpload = MutableLiveData<String>()
+    val savedCalibrationData = MutableLiveData<String>()
 
     fun loadSavedCalibrationData(): CalibrationData {
         val calibrationData = CalibrationData()

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

@@ -4,10 +4,7 @@ import android.app.DownloadManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
-import android.content.SharedPreferences
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
@@ -22,41 +19,28 @@ 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.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.presentation.NatsManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.jig.JigActivity
 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 com.google.firebase.firestore.ktx.firestore
-import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
 import okhttp3.ResponseBody
 import java.io.File
 
-interface NatsMessageCallback {
+open interface IDataCollector {
-    fun onMessageReceived(topic: String, message: String)
-}
-
-open interface IDataCollector: NatsMessageCallback {
     fun setConnect(connect: Boolean)
     fun setResponse(response: String)
 }
-
 @AndroidEntryPoint
 class DashboardActivity : AppCompatActivity(), IDataCollector {
 
-    val TAG = "DashboardActivity"
-    private var isRegistered= false
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityDashboardBinding
-    lateinit var sharedPreferences: SharedPreferences
     var responses: String = ""
     lateinit var nats: NatsManager
     private var downloadId: Long = 0
@@ -69,28 +53,15 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         super.attachBaseContext(newBase)
     }
 
-    override fun onMessageReceived(topic: String, message: String) {
-        // Handle incoming messages from NATS
-
-        Log.d(TAG, "Received message on topic $topic: $message")
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         binding = ActivityDashboardBinding.inflate(layoutInflater)
-        sharedPreferences = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         setContentView(binding.root)
         setSupportActionBar(binding.appBarDashboard.toolbar)
         nats = NatsManager(this)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
         nats.connect()
-        }
+        nats.pub("server.hpos.HCV-000-3001.ping", "THIS IS A TEST MSG")
-
-        val deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
-
-        nats.sub("server.hpos.${deviceId}.ping")
-        nats.pub("server.hpos.${deviceId}.ping", "THIS IS A TEST MSG")
 
         hemocubeViewModel.deviceUpdate.observe(this) { result ->
             when (result) {
@@ -100,11 +71,11 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
 //                    val apkUrl = "https://dl.dropboxusercontent.com/s/fi/1c3nn7t0co431hicl3hrt/app-debug.apk?rlkey=e4uf13ty1dpcked614vy1aaqp&dl=0"
                     initiateUpdate(apkUrl.toString())
                     Log.d("ApI", "APK URL: $apkUrl")
-//                    Toast.makeText(
+                    Toast.makeText(
-//                        this,
+                        this,
-//                        "APK UPLOAD ${result.data}",
+                        "APK UPLOAD ${result.data}",
-//                        Toast.LENGTH_SHORT
+                        Toast.LENGTH_SHORT
-//                    ).show()
+                    ).show()
                 }
 
                 is Result.Error -> {
@@ -134,14 +105,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         )
         setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
-
-        if (Constants.NAVIGATE_TO_TEST_JIG_DIRECTLY) {
-            startActivity(Intent(this, JigActivity::class.java))
-            finish()
     }
-    }
-
-
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         // Inflate the menu; this adds items to the action bar if it is present.
@@ -154,8 +118,8 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
     }
 
-    private fun initiateUpdate(url: String) {
+    private fun initiateUpdate(responseBody: String) {
-        val apkUrl = url
+        val apkUrl = responseBody
         if (!isValidHttpUrl(apkUrl)) {
             return
         }
@@ -170,11 +134,8 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         downloadId = downloadManager.enqueue(request)
 
         // Register a BroadcastReceiver to receive the download complete event
-        val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
+//        val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+//        registerReceiver(downloadReceiver, filter)
-            isRegistered = true
-            registerReceiver(downloadReceiver, filter, RECEIVER_EXPORTED)
-        }
     }
     private fun extractApkUrl(responseBody: ResponseBody): String {
         return responseBody.string()
@@ -198,7 +159,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         val pInfo = baseContext.packageManager.getPackageInfo(baseContext.packageName, 0)
         val uri: Uri = FileProvider.getUriForFile(
             this,
-            "in.sminnovations.hpostesting.dev.fileprovider",
+            "${pInfo}.fileprovider",
             file
         )
 
@@ -218,15 +179,8 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
     }
 
     override fun onDestroy() {
-        try {
-            if (isRegistered){
-                unregisterReceiver(downloadReceiver)
-            }
-        }catch (e: IllegalArgumentException){
-            Log.e("HOmeFragment",e.toString())
-        }
-
         super.onDestroy()
+//        unregisterReceiver(downloadReceiver)
     }
 
     override fun onResume() {
@@ -276,8 +230,8 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
     }
 
     override fun setResponse(response: String) {
+
         responses = responses+response+"\n"
         println(responses)
-        Log.d("DashBoardActResponse",response)
     }
 }

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

@@ -27,7 +27,6 @@ class GalleryFragment : Fragment() {
     private var _binding: FragmentGalleryBinding? = null
     private lateinit var sharedPreferences: SharedPreferences
     private var userid = ""
-
     // This property is only valid between onCreateView and
     // onDestroyView.
     private val binding get() = _binding!!
@@ -38,7 +37,7 @@ class GalleryFragment : Fragment() {
 
     @SuppressLint("SetTextI18n")
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
 //        val galleryViewModel =
 //            ViewModelProvider(this).get(GalleryViewModel::class.java)
@@ -58,7 +57,7 @@ class GalleryFragment : Fragment() {
         ) {
             binding.btnDeviceProvision.visibility = View.VISIBLE
         } else {
-            binding.btnDeviceProvision.visibility = View.VISIBLE
+            binding.btnDeviceProvision.visibility = View.GONE
         }
 
         binding.btnDeviceProvision.setOnClickListener {

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

@@ -1,18 +1,12 @@
 package com.example.hpostesting.presentation.dashboard
 
-import android.annotation.SuppressLint
 import android.app.AlertDialog
-import android.app.DownloadManager
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Context.BATTERY_SERVICE
 import android.content.DialogInterface
 import android.content.Intent
-import android.content.IntentFilter
 import android.content.SharedPreferences
-import android.net.Uri
 import android.os.BatteryManager
-import android.os.Build
 import android.os.Bundle
 import android.util.Base64
 import android.util.Log
@@ -20,26 +14,21 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.content.FileProvider
 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.api.DeviceCommunicationHandler
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
 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.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.DeviceUpdateRequest
 import com.example.hpostesting.presentation.KitScanActivity
-import com.example.hpostesting.presentation.UsbServiceListener
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
 import com.example.hpostesting.presentation.adapter.UserListAdapter
 import com.example.hpostesting.presentation.assurance.AssuranceControlsActivity
@@ -54,14 +43,13 @@ import com.google.firebase.perf.ktx.performance
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
-import kotlinx.coroutines.tasks.await
 import okhttp3.ResponseBody
 import org.json.JSONObject
 import java.io.BufferedOutputStream
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
-import java.nio.charset.Charset
+import java.net.URL
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
@@ -71,9 +59,8 @@ import java.util.zip.ZipInputStream
 
 @AndroidEntryPoint
 class HomeFragment : Fragment() {
-    private var downloadId: Long = 0
+    private var _binding: FragmentHomeBinding? = null
-    private var isRegistered = false
+    private val binding get() = _binding!!
-    private lateinit var binding: FragmentHomeBinding
     private val viewModel: TestRightViewModel by activityViewModels()
     private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
     private lateinit var rvAdapter: UserListAdapter
@@ -83,14 +70,18 @@ class HomeFragment : Fragment() {
     private val homeViewModel: HemoCubeViewModel by activityViewModels()
 
     private var isTokenAvailable = false
-    private var natsToken: String = ""
-    private var deviceId: String = ""
     private lateinit var sharedPreference: SharedPreferences
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
-    ): View {
+    ): View? {
-        binding = FragmentHomeBinding.inflate(inflater, container, false)
+        _binding = FragmentHomeBinding.inflate(inflater, container, false)
+
+        // Check if _binding is null
+        if (_binding == null) {
+            // Handle the case where binding could not be initialized
+            // You may want to log an error or return a default view in this case
+            return super.onCreateView(inflater, container, savedInstanceState)
+        }
 
         sharedPreference = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         DataHolder.selectedTest = null
@@ -102,12 +93,11 @@ class HomeFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+            binding.labelQuickCapture.visibility = View.VISIBLE
             binding.btnQuickCapture.visibility = View.VISIBLE
         }
 
-        getDeviceId()
         checkUnprocessedCSVData()
-        checkForUpdate()
         viewModel.allUserData.observe(viewLifecycleOwner) { userData ->
             deleteIncompleteRegistrations(userData)
         }
@@ -127,61 +117,17 @@ class HomeFragment : Fragment() {
                 binding.rvOrderOffline.adapter = adapter
             }
         }
-//        hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) { deviceData ->
-//            val devicelist = mutableListOf<DeviceData>()
-//            if (deviceData != null) {
-//                devicelist.add(DeviceData(deviceData.deviceId))
-//            }
-//
-//        }
         viewModel.networkStatusLiveData?.observe(viewLifecycleOwner) { isConnected ->
             if (isConnected) {
+
                 binding.internetAvailableCL.visibility = View.VISIBLE
                 binding.internetNotAvailableCL.visibility = View.GONE
-                binding.pendingTest.visibility = View.VISIBLE
                 loadUserData()
                 setSearch()
                 checkForLocalDBData()
-                if (Constants.MOLBIO_INTEGRATION) {
                 checkForTokenAndUpdate()
-                }
-
-                hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-                    val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
-                    userDataList.forEach { userData ->
-                        if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
-                            resultList.results?.add(
-                                MolbioV2Result(
-                                    rawData = userData,
-                                    analysisId = userData._id,
-                                    analysisDate = "2024-02-08 16:33:56",//userData.testTime,
-                                    analysisStatus = userData.classificationResult,
-                                    thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
-                                    interpretation = userData.classificationResult,
-                                    testId = userData._id,
-                                    testTime = "2024-02-08 16:33:56",//userData.testTime,
-                                    collectionTime = "2024-02-08 16:33:56",//userData.testTime,
-                                    expiryTime = "2024-02-08 16:33:56"//userData.testTime,
-                                )
-                            )
-                        }
-                        if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
-                            userData.molbioFlag = true
-                            hemoCubeViewModel.uploadResult(resultList)
-                        }
-
-                        if (!userData.localFlag) {
-                            userData.localFlag = true
-                            hemoCubeViewModel.bulkAddResultTestToDb(userData)
-                        }
-
-                    }
-
-                }
-
             } else {
                 binding.internetAvailableCL.visibility = View.GONE
-                binding.pendingTest.visibility = View.GONE
                 binding.internetNotAvailableCL.visibility = View.VISIBLE
                 setUserId()
             }
@@ -201,17 +147,18 @@ class HomeFragment : Fragment() {
             logoutUser(requireContext())
         }
 
+
         binding.uploadData.setOnClickListener {
             showUploadDialog(requireContext())
         }
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
 
             val btnSaveLocalVisibility =
-                if (userData.any { it.testStatus == true }) View.GONE else View.GONE
+                if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE
 
-            binding.downloadCSV.visibility = btnSaveLocalVisibility
+            binding.btnSaveLocal.visibility = btnSaveLocalVisibility
 
-            binding.downloadCSV.setOnClickListener {
+            binding.btnSaveLocal.setOnClickListener {
                 if (btnSaveLocalVisibility == View.VISIBLE) {
                     // Execute the action when the button is visible (testStatus is true for at least one user)
                     showDownloadDialog(requireContext())
@@ -225,8 +172,6 @@ class HomeFragment : Fragment() {
                 }
             }
         }
-
-
         binding.btnNewKit.setOnClickListener {
             with(sharedPreference.edit()) {
                 putString(Constants.KIT_NUMBER, "")
@@ -248,44 +193,26 @@ class HomeFragment : Fragment() {
         binding.downloadCSV.setOnClickListener {
             showDownloadDialog(requireContext())
         }
-
     }
 
     private fun checkForTokenAndUpdate() {
-        var accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
+        val accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
-        var password = sharedPreference.getString(Constants.DEVICE_PASSWORD_API, "").toString()
+        val password = sharedPreference.getString(Constants.DEVICE_PASSWORD_API, "").toString()
-        var userID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
+        val userID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
-        deviceId = sharedPreference.getString(Constants.DEVICE_ID, "").toString()
         if (userID.isNotEmpty() && password.isNotEmpty()) {
-            if (!isTokenAvailable) {
+            if (accessToken.isEmpty()) {
                 hemoCubeViewModel.login(createLoginRequestData(userID, password))
             } else {
                 if (isTokenExpired(accessToken)) {
                     hemoCubeViewModel.login(createLoginRequestData(userID, password))
                 } else {
                     isTokenAvailable = true
-
                     hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
                     hemoCubeViewModel.uploadLogs()
                     hemoCubeViewModel.startPeriodicCheckUpdate()
                     hemoCubeViewModel.downloadClientCertificate()
                 }
             }
-        } else if (deviceId.isNotEmpty()) {
-            fetchDeviceCredentials()
-            // This code will execute after credentials have been successfully fetched and stored.
-            userID = sharedPreference.getString("username", "").toString()
-            password = sharedPreference.getString("password", "").toString()
-            accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
-            if (accessToken.isEmpty()) {
-                hemoCubeViewModel.login(createLoginRequestData(userID, password))
-            } else {
-                // Continue with your existing logic if the token is not empty.
-                isTokenAvailable = true
-                hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
-                hemoCubeViewModel.uploadLogs()
-                hemoCubeViewModel.startPeriodicCheckUpdate()
-            }
         } else {
             Toast.makeText(
                 requireContext(),
@@ -294,6 +221,10 @@ class HomeFragment : Fragment() {
             ).show()
         }
 
+
+
+
+
         hemoCubeViewModel.loginResponse.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
@@ -322,11 +253,11 @@ class HomeFragment : Fragment() {
         hemoCubeViewModel.uploadLogs.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
-//                    Toast.makeText(
+                    Toast.makeText(
-//                        requireContext(),
+                        requireContext(),
-//                        "Log uploaded ${response.data.data?.filename}",
+                        "Log uploaded ${response.data.data?.filename}",
-//                        Toast.LENGTH_SHORT
+                        Toast.LENGTH_SHORT
-//                    ).show()
+                    ).show()
                 }
 
                 is Result.Error -> {
@@ -348,6 +279,8 @@ class HomeFragment : Fragment() {
             }
         }
 
+
+
         hemoCubeViewModel.downloadcertificate.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
@@ -356,22 +289,12 @@ class HomeFragment : Fragment() {
                     val fileName = "nats_certificate.zip"
                     val downloadDirectory = "NATS"
                     val file = downloadFile(url, requireContext(), fileName, downloadDirectory)
-                    Toast.makeText(
+                    Toast.makeText(requireContext(), "NATS certificate Downloaded", Toast.LENGTH_SHORT).show()
-                        requireContext(),
-                        "NATS certificate Downloaded",
-                        Toast.LENGTH_SHORT
-                    ).show()
 
-                    val unzipDirectoryPath =
+                    val unzipDirectoryPath = requireContext().getExternalFilesDir(null)?.absolutePath + "/$downloadDirectory"
-                        requireContext().getExternalFilesDir(null)?.absolutePath + "/$downloadDirectory"
                     unzip(file.absolutePath, unzipDirectoryPath)
-                    Toast.makeText(
+                    Toast.makeText(requireContext(), "NATS certificate Extracted", Toast.LENGTH_SHORT).show()
-                        requireContext(),
-                        "NATS certificate Extracted",
-                        Toast.LENGTH_SHORT
-                    ).show()
                 }
-
                 is Result.Error -> {
                     response.exception.let { message ->
                         Toast.makeText(
@@ -469,12 +392,7 @@ class HomeFragment : Fragment() {
         )
     }
 
-    private fun downloadFile(
+    private fun downloadFile(responseBody: ResponseBody, context: Context, fileName: String, downloadDirectory: String): File {
-        responseBody: ResponseBody,
-        context: Context,
-        fileName: String,
-        downloadDirectory: String,
-    ): File {
         // Ensure the download directory exists
         val fileDir = File(context.getExternalFilesDir(null), downloadDirectory)
         if (!fileDir.exists()) {
@@ -495,6 +413,8 @@ class HomeFragment : Fragment() {
     }
 
 
+
+
     private fun unzip(zipFilePath: String, destDirectory: String) {
         val destDir = File(destDirectory)
         if (!destDir.exists()) {
@@ -551,52 +471,6 @@ class HomeFragment : Fragment() {
         }
     }
 
-    private fun fetchDeviceCredentials() {
-        try {
-            val db = Firebase.firestore
-            // Ensure deviceId is not null or empty
-            val deviceId =
-                sharedPreference.getString(Constants.DEVICE_ID, "").takeIf { it!!.isNotBlank() }
-                    ?: throw IllegalStateException("Device ID is missing or blank.")
-
-            val deviceRef = db.collection("devices").whereEqualTo("deviceId", deviceId)
-
-            deviceRef.get()
-                .addOnSuccessListener { documentSnapshot ->
-                    if (!documentSnapshot.isEmpty) {
-                        val deviceData =
-                            documentSnapshot.documents[0].toObject(DeviceData::class.java)
-                        deviceData?.let { data ->
-                            val username = data.username
-                            val password = data.password
-                            val natsToken = data.natsToken
-                            // Log for debugging
-                            Log.d(
-                                "fetchDeviceCredentials",
-                                "Username: $username, Password: $password"
-                            )
-                            // Save credentials in SharedPreferences
-                            with(sharedPreference.edit()) {
-                                putString("username", username)
-                                putString("password", password)
-                                putString(Constants.NATS_TOKEN, natsToken)
-                                apply()
-                            }
-                            hemoCubeViewModel.login(createLoginRequestData(username, password))
-                        } ?: Log.e("fetchDeviceCredentials", "Failed to parse device data.")
-                    } else {
-                        Log.e("fetchDeviceCredentials", "Document does not exist.")
-                    }
-                }
-                .addOnFailureListener { exception ->
-                    Log.e("fetchDeviceCredentials", "Error fetching device data", exception)
-                }
-        } catch (e: Exception) {
-            Log.e("fetchDeviceCredentials", "Error in fetchDeviceCredentials", e)
-        }
-    }
-
-
     private fun loadUserData() {
         try {
             val dateFormat = SimpleDateFormat("yyyy-MM-dd")
@@ -766,7 +640,7 @@ class HomeFragment : Fragment() {
     private fun checkUnprocessedCSVData() {
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             val downloadDataVisibility =
-                if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.GONE else View.GONE
+                if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.VISIBLE else View.GONE
             binding.downloadCSV.visibility = downloadDataVisibility
         }
     }
@@ -824,33 +698,30 @@ class HomeFragment : Fragment() {
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
             userDataList.forEach { userData ->
+                if (!userData.localFlag) {
+                    userData.localFlag = true
+                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
                     if (!userData.molbioFlag && isTokenAvailable) {
                         resultList.results?.add(
                             MolbioV2Result(
                                 rawData = userData,
                                 analysisId = userData._id,
-                            analysisDate = "2024-02-08 16:33:56", //userData.reportUploadTime,
+                                analysisDate = userData.testTime,
                                 analysisStatus = userData.classificationResult,
                                 thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
                                 interpretation = userData.classificationResult,
                                 testId = userData._id,
                                 testTime = userData.testTime,
-                            collectionTime = "2024-02-08 16:33:56",//userData.testTime,
+                                collectionTime = userData.testTime,
-                            expiryTime = "2024-02-08 16:33:56",//userData.testTime,
+                                expiryTime = userData.testTime,
                             )
                         )
-
                     }
-
-                if (!userData.localFlag) {
-                    userData.localFlag = true
-                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
                 }
-                if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
+            }
-                    userData.molbioFlag = true
+            if (isTokenAvailable) {
                 hemoCubeViewModel.uploadResult(resultList)
             }
-            }
             dialog.dismiss()
         }
 
@@ -863,37 +734,6 @@ class HomeFragment : Fragment() {
             }
             dialog.dismiss()
         }
-
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
-            userDataList.forEach { userData ->
-                if (!userData.molbioFlag && isTokenAvailable) {
-                    resultList.results?.add(
-                        MolbioV2Result(
-                            rawData = userData,
-                            analysisId = userData._id,
-                            analysisDate = "2024-02-08 16:33:56",//userData.testTime,
-                            analysisStatus = userData.classificationResult,
-                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
-                            interpretation = userData.classificationResult,
-                            testId = userData._id,
-                            testTime = "2024-02-08 16:33:56",//userData.testTime,
-                            collectionTime = "2024-02-08 16:33:56",//userData.testTime,
-                            expiryTime = "2024-02-08 16:33:56"//userData.testTime,
-                        )
-                    )
-                    userData.molbioFlag = true
-                    hemoCubeViewModel.uploadResult(resultList)
-                }
-
-                if (!userData.localFlag) {
-                    userData.localFlag = true
-                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
-                }
-
-            }
-            dialog.dismiss()
-        }
     }
 
 //    private fun downloadLocalDBData(dialog: DialogInterface) {
@@ -936,6 +776,7 @@ class HomeFragment : Fragment() {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        _binding = null
     }
 
     private fun downloadCsv() {
@@ -1012,207 +853,4 @@ class HomeFragment : Fragment() {
             }
         }
     }
-
-    private fun getDeviceId() {
-        val handler = activity as? DeviceCommunicationHandler
-        handler?.sendAndListenToDevice(
-            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val receivedData = String(it, Charset.forName("UTF-8"))
-                        // Assuming the device ID is the full content of the received data. Adjust if needed.
-                        deviceId =
-                            extractDeviceId(receivedData) // Implement this method based on your data format.
-                        if (deviceId.isNotEmpty()) {
-                            // Store the deviceId in SharedPreferences
-                            with(sharedPreference.edit()) {
-                                putString(Constants.DEVICE_ID, deviceId)
-                                apply()
-                            }
-                            // Optionally, you can update UI or proceed with further logic now that you have the device ID
-                            activity?.runOnUiThread {
-                                // Update your UI or trigger next steps here
-                            }
-                        }
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    // Handle USB communication error
-                }
-
-            })
-    }
-
-    fun extractDeviceId(receivedData: String): String {
-        // Example based on the format "SNS HPP1-3038 SNE"
-        val regex = "SNS (\\w+) SNE".toRegex()
-        val matchResult = regex.find(receivedData)
-        return matchResult?.groups?.get(1)?.value ?: ""
-    }
-    @SuppressLint("SuspiciousIndentation")
-    private fun checkForUpdate() {
-        try {
-            val db = Firebase.firestore
-
-            val deviceId="HHH-AAA-ZZZ"
-            val deviceRef = db.collection("deviceUpdate").document(Constants.DOCUMENT_ID_FOR_UPDATE)
-
-            deviceRef.get().addOnSuccessListener { documentSnapshot ->
-                    if (documentSnapshot.exists()) {
-
-                        val deviceData =
-                            documentSnapshot.toObject(DeviceData::class.java)
-
-                       // deviceData?.let { data ->
-
-                            val deviceVersion = deviceData!!.deviceVersion
-                            val deviceUpdateAvailableGlobal= deviceData.deviceUpdateAvailable
-                            val updatePathGlobal= deviceData.updatePath
-
-                           // if(deviceUpdateAvailableGlobal){
-                                 db.collection("devices").whereEqualTo("deviceId", deviceId).get().addOnSuccessListener { documentSnapshotNew ->
-                                    if (documentSnapshotNew.documents.isNotEmpty()) {
-                                        documentSnapshotNew.documents.forEach{
-                                            val documentIn = it.toObject(DeviceData::class.java)
-
-                                            val globalUpdateIgnore = documentIn!!.globalUpdateIgnore
-                                            val deviceUpdateAvailable = documentIn.deviceUpdateAvailable
-                                            val globalUpdateDone = documentIn.globalUpdateDone
-                                            val updatePath = documentIn.updatePath
-                                            if(globalUpdateIgnore){
-                                                if(deviceUpdateAvailable){
-                                                    val update = db.collection("devices").document(it.id).update("deviceUpdateAvailable",false)
-                                                    update.addOnSuccessListener {
-                                                        Log.d("HomeFragmentUpdate","Device local update done")
-
-                                                        initiateUpdate(updatePath)
-                                                    }.addOnFailureListener{
-                                                        Log.e("fetchDeviceUpdate", "update fail.")
-                                                    }
-                                                }else{
-                                                    Log.d("HomeFragmentUpdate","Device update not available")
-                                                }
-                                            }else{
-                                                if(!globalUpdateDone){
-                                                    val update = db.collection("devices").document(it.id).update("globalUpdateDone",true)
-                                                    update.addOnSuccessListener {
-                                                        Log.d("HomeFragmentUpdate","Device global update done")
-
-                                                        initiateUpdate(updatePathGlobal)
-                                                    }.addOnFailureListener{
-                                                        Log.e("fetchDeviceUpdate", "update fail.")
-                                                    }
-                                                }
-                                            }
-                                        }
-
-                                    } else {
-                                        Log.e("fetchDeviceUpdate", "Document does not exist.")
-                                    }
-                                }.addOnFailureListener { exception ->
-                                    Log.e("fetchDeviceUpdate", "Error fetching device data", exception)
-                                }
-
-
-                              //  Toast.makeText(requireActivity()," true -version."+deviceVersion+"updatePath.."+updatePath,Toast.LENGTH_LONG).show()
-
-
-                            // Log for debugging
-                            Log.d(
-                                "fetchDeviceCredentials",
-                                "deviceVersion: $deviceVersion, Password: $deviceUpdateAvailableGlobal, updatePath: $updatePathGlobal"
-                            )
-
-                       // } ?: Log.e("fetchDeviceUpdate", "Failed to parse device data.")
-                    } else {
-                        Log.e("fetchDeviceUpdate", "Document does not exist.")
-                    }
-                }
-                .addOnFailureListener { exception ->
-                    Log.e("fetchDeviceUpdate", "Error fetching device data", exception)
-                }
-        } catch (e: Exception) {
-            Log.e("fetchDeviceUpdate", "Error in fetchDeviceUpdate", e)
-        }
-    }
-
-
-    private fun initiateUpdate(url: String) {
-        val apkUrl = url
-        if (!isValidHttpUrl(apkUrl)) {
-            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(requireActivity(), "Updates", "update.apk")
-
-        val downloadManager = requireActivity().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)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            isRegistered = true
-            requireActivity().registerReceiver(downloadReceiver, filter, Context.RECEIVER_EXPORTED)
-        }
-    }
-    private fun extractApkUrl(responseBody: ResponseBody): String {
-        return responseBody.string()
-    }
-    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) {
-                installApk()
-            }
-        }
-    }
-
-    private fun installApk() {
-        val file = File(requireActivity().getExternalFilesDir("Updates"), "update.apk")
-        file.setReadable(true, false) // Ensure the file is readable
-
-        val pInfo = requireActivity().baseContext.packageManager.getPackageInfo(requireActivity().baseContext.packageName, 0)
-        Log.d("HomeFragmentShowInfo",pInfo.packageName.toString())
-        val uri: Uri = FileProvider.getUriForFile(
-            requireActivity(),
-            "${pInfo.packageName}.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: ${requireActivity().packageName}")
-    }
-
-    override fun onDestroy() {
-        try {
-            if (isRegistered){
-                requireActivity().unregisterReceiver(downloadReceiver)
-            }
-        }catch (e: IllegalArgumentException){
-            Log.e("HOmeFragment",e.toString())
-        }
-
-        super.onDestroy()
-    }
-
 }

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

@@ -37,8 +37,7 @@ class SlideshowFragment : PreferenceFragmentCompat() {
         // App Version Preference
         val appVersionPreference = Preference(requireContext())
         appVersionPreference.title = "App Version"
-        appVersionPreference.summary =
+        appVersionPreference.summary = getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
-            getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
 
         preferenceScreen.addPreference(languagePreference)
         preferenceScreen.addPreference(appVersionPreference)

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

@@ -3,11 +3,11 @@ package com.example.hpostesting.presentation.dashboard.ui
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import com.example.hpostesting.data.constant.Constants
 import `in`.sminnovations.hpostesting.R
@@ -20,7 +20,7 @@ class LoginFragment : Fragment() {
     private lateinit var sharedPreference: SharedPreferences
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?,
+        savedInstanceState: Bundle?
     ): View {
         _binding = FragmentLoginBinding.inflate(inflater, container, false)
         sharedPreference =
@@ -33,6 +33,7 @@ class LoginFragment : Fragment() {
         init()
     }
 
+
     private fun init() {
         if (isUserLoggedIn()) {
             navigateToHomeFragment()

app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceActivity.kt

@@ -12,21 +12,18 @@ import android.content.SharedPreferences
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.IBinder
 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.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.api.DeviceCommunicationHandler
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.UsbServiceListener
 import com.example.hpostesting.presentation.testRight.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
@@ -36,7 +33,7 @@ import `in`.sminnovations.hpostesting.databinding.ActivityDeviceBinding
 
 @Suppress("MemberVisibilityCanBePrivate")
 @AndroidEntryPoint
-class DeviceActivity : AppCompatActivity(), DeviceCommunicationHandler {
+class DeviceActivity : AppCompatActivity() {
     private lateinit var binding: ActivityDeviceBinding
     private val deviceViewModel by viewModels<DeviceViewModel>()
     private var myMenu: Menu? = null
@@ -172,7 +169,6 @@ class DeviceActivity : AppCompatActivity(), DeviceCommunicationHandler {
         menuInflater.inflate(R.menu.my_menu, menu)
         return true
     }
-
     override fun onDestroy() {
         super.onDestroy()
         if (deviceViewModel.isServiceConnected) {
@@ -181,11 +177,4 @@ class DeviceActivity : AppCompatActivity(), DeviceCommunicationHandler {
             deviceViewModel.isServiceConnected = false
         }
     }
-
-    override fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener) {
-        mService.sendAndListenToHemoCube(
-            command = HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
-            listener
-        )
-    }
 }

app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceFragment.kt

@@ -18,6 +18,8 @@ import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDeviceBinding
 
+
+
 class DeviceFragment : Fragment() {
     private lateinit var binding: FragmentDeviceBinding
     private val deviceViewModel: HemoCubeViewModel by activityViewModels()
@@ -59,7 +61,6 @@ class DeviceFragment : Fragment() {
                         binding.tvSubtitle4.text = "Device ID: ${stringData}"
                     }
                 }
-
                 override fun onUsbError(e: Exception?) {
                     deviceViewModel.progressBar.postValue(false)
                 }
@@ -67,6 +68,7 @@ class DeviceFragment : Fragment() {
     }
 
 
+
     private fun listenToHemoCube() {
 
         val fullReadOutput = StringBuilder()

app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceViewModel.kt

@@ -7,7 +7,6 @@ import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.repository.Repository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
-
 @HiltViewModel
 class DeviceViewModel @Inject constructor(
     private val hemoCubeDao: HemoCubeDao,
@@ -16,6 +15,11 @@ class DeviceViewModel @Inject constructor(
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
     val messages = MutableLiveData<String>()
+//    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+//    val allUserData = hemoCubeDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
+//    val networkStatusLiveData: LiveData<Boolean>
+//        get() = _networkStatusLiveData
     val fireBaseUpload = MutableLiveData<String>()
+
 }

app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionActivity.kt

@@ -21,11 +21,8 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.api.DeviceCommunicationHandler
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.UsbServiceListener
 import com.example.hpostesting.presentation.testRight.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
@@ -34,7 +31,7 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityAutoDacBinding
 
 @AndroidEntryPoint
-class DeviceProvisionActivity : AppCompatActivity(), DeviceCommunicationHandler {
+class DeviceProvisionActivity : AppCompatActivity() {
     private lateinit var binding: ActivityAutoDacBinding
     val viewModel: DeviceProvisionViewModel by viewModels()
     private var myMenu: Menu? = null
@@ -145,8 +142,7 @@ class DeviceProvisionActivity : AppCompatActivity(), DeviceCommunicationHandler
 
     @SuppressLint("MutableImplicitPendingIntent")
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent =
+        val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
             PendingIntent.getBroadcast(
                 this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
             )
@@ -184,11 +180,4 @@ class DeviceProvisionActivity : AppCompatActivity(), DeviceCommunicationHandler
             viewModel.isServiceConnected = false
         }
     }
-
-    override fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener) {
-        mService.sendAndListenToHemoCube(
-            command = HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
-            listener
-        )
-    }
 }

app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt

@@ -11,12 +11,10 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.MutableLiveData
 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.deviceprovision.DeviceProvisionRequest
-import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.presentation.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.firebase.crashlytics.ktx.crashlytics
@@ -24,16 +22,13 @@ import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDeviceProvisionBinding
 
 class DeviceProvisionFragment : Fragment() {
+
     private var resultData: String = ""
     private lateinit var binding: FragmentDeviceProvisionBinding
     private val viewModel: DeviceProvisionViewModel by activityViewModels()
     private lateinit var sharedPreferences: SharedPreferences
-    private lateinit var deviceProvisionResponse: String
-    private var currentDeviceData: DeviceData? = null
-    private var isOnline = false
-    val deviceData = MutableLiveData<DeviceData?>()
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
         binding = FragmentDeviceProvisionBinding.inflate(inflater, container, false)
         sharedPreferences = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
@@ -50,25 +45,18 @@ class DeviceProvisionFragment : Fragment() {
         listenToHemoCube()
         getDeviceId()
         binding.btnSubmit.setOnClickListener {
-            if (Constants.MOLBIO_INTEGRATION) {
             viewModel.deviceProvision(
                 DeviceProvisionRequest(
                     email = Constants.deviceProvisionEmail,
                     password = Constants.deviceProvisionPassword,
-                        serialNumber = sharedPreferences.getString(Constants.DEVICE_ID, "")
+                    serialNumber = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-                            .toString(),
                     uid = sharedPreferences.getString(Constants.DEVICE_ID, "").toString()
                 )
             )
         }
     }
-    }
-
 
     private fun observeViewModel() {
-        viewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
-        }
 
         viewModel.deviceProvisionResponse.observe(viewLifecycleOwner) { response ->
             when (response) {
@@ -88,8 +76,7 @@ class DeviceProvisionFragment : Fragment() {
                                 response.data.data?.device?.deviceUser?.natsToken
                             )
                             response.data.data?.device?.deviceUser?.natsToken?.let {
-                                Log.e(
+                                Log.e("natstoken",
-                                    "natstoken",
                                     it
                                 )
                             }
@@ -99,34 +86,14 @@ class DeviceProvisionFragment : Fragment() {
                             )
                             apply()
                         }
-                        startActivity(
+                        startActivity(Intent(requireContext(), DashboardActivity::class.java))
-                            Intent(
-                                requireContext(),
-                                DashboardActivity::class.java
-                            )
-                        )
                         Toast.makeText(
                             activity, "Device registered successfully", Toast.LENGTH_LONG
                         ).show()
-                        viewModel.addDeviceProvisionDataToDb(
-                            DeviceData(
-                                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
-                                    .toString(),
-                                username = response.data.data?.credentials?.username.toString(),
-                                password = response.data.data?.credentials?.password.toString(),
-                                deviceProvisionResponse = response.data.data.toString(),
-                                natsToken = response.data.data?.device?.deviceUser?.natsToken.toString(),
-                                natsTokenExpiry = response.data.data?.device?.deviceUser?.natsTokenExpiry.toString()
-                            )
-                        )
-//                        viewModel.addDeviceId(DeviceData(deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString()))
-                        Log.e("idpass", response.toString())
-                        Log.e("idpass", response.data.data?.credentials?.username.toString())
-                        Log.e("idpass", deviceProvisionResponse)
                     } else {
                         Toast.makeText(
                             activity,
-                            "An error in device provision: ${response.data.message}",
+                            "An error occurred in device provision: ${response.data.message}",
                             Toast.LENGTH_LONG
                         ).show()
                         binding.btnSubmit.visibility = View.VISIBLE
@@ -151,15 +118,6 @@ class DeviceProvisionFragment : Fragment() {
                 else -> {}
             }
         }
-        viewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                Toast.makeText(
-                    activity,
-                    "Device provision successfully uploaded to firebase",
-                    Toast.LENGTH_LONG
-                ).show()
-            }
-        }
     }
 
     private fun getDeviceId() {
@@ -176,8 +134,7 @@ class DeviceProvisionFragment : Fragment() {
         val fullReadOutput = StringBuilder()
 
         try {
-            (activity as DeviceProvisionActivity).mService.listenToHemoCube(object :
+            (activity as DeviceProvisionActivity).mService.listenToHemoCube(object : UsbServiceListener {
-                UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
                         val stringData = String(it)

app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionViewModel.kt

@@ -4,10 +4,8 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
-import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.repository.Repository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
@@ -15,54 +13,17 @@ import javax.inject.Inject
 
 @HiltViewModel
 class DeviceProvisionViewModel @Inject constructor(
-    private val repository: Repository,
+    private val databaseRepository: Repository
 ) : ViewModel() {
+
     var isServiceConnected = false
+
     val deviceProvisionResponse = MutableLiveData<Result<DeviceProvisionResponse>>()
-    val fireBaseUpload = MutableLiveData<String>()
-    val fireBaseBulkUpload = MutableLiveData<String>()
-    val deviceData = MutableLiveData<DeviceData?>()
 
     fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest) = viewModelScope.launch {
         deviceProvisionResponse.postValue(Result.Loading())
-        repository.deviceProvision(deviceProvisionRequest).let {
+        databaseRepository.deviceProvision(deviceProvisionRequest).let {
             deviceProvisionResponse.postValue(it)
         }
     }
-
-
-    fun addDeviceId(data: DeviceData) {
-        viewModelScope.launch {
-            try {
-                repository.uploadDeviceId(data)
-                fireBaseUpload.postValue("Successfully device Id uploaded to firebase")
-            } catch (e: Exception) {
-//                Log.e("Testdb", "Exception during data upload: ${e.message}")
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
-
-    fun addDeviceProvisionDataToDb(data: DeviceData) {
-        viewModelScope.launch {
-            try {
-                when (val response = repository.getDeviceResponse(data)) {
-                    is Response.Success -> {
-//                        Log.i("Testdb", "Data uploaded to Firestore successfully")
-                        fireBaseUpload.postValue("Successfully device response uploaded to firebase")
-                    }
-
-                    is Response.Error -> {
-//                        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}")
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
 }

app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsActivity.kt

@@ -11,13 +11,13 @@ import android.content.ServiceConnection
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.IBinder
 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.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
@@ -63,6 +63,7 @@ class DiagnosticsActivity : AppCompatActivity() {
         }
     }
 
+
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as UsbService.UsbServiceBinder
@@ -107,7 +108,6 @@ class DiagnosticsActivity : AppCompatActivity() {
             }
         }
     }
-
     open fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
@@ -127,16 +127,17 @@ class DiagnosticsActivity : AppCompatActivity() {
         }
     }
 
+
     fun onErrorReported(msg: String) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
         if (!isFinishing) onBackPressed()
     }
 
+
     private fun moveToNext() {
         if (supportFragmentManager.isDestroyed) return
 
-        supportFragmentManager.beginTransaction()
+        supportFragmentManager.beginTransaction().replace(binding.fgDiagnostics.id, DiagnosticsFragment())
-            .replace(binding.fgDiagnostics.id, DiagnosticsFragment())
             .commit()
     }
 
@@ -161,16 +162,17 @@ class DiagnosticsActivity : AppCompatActivity() {
         manager.requestPermission(device, mPendingIntent)
     }
 
+
     fun setupService() {
         val intent = Intent(this, UsbService::class.java)
         bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
 
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.my_menu, menu)
         return true
     }
-
     override fun onDestroy() {
         super.onDestroy()
         if (viewModel.isServiceConnected) {

app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt

@@ -1,8 +1,6 @@
 package com.example.hpostesting.presentation.diagnostics
 
 import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.util.Log
@@ -13,12 +11,8 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.Result.Success
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.data.model.devicediagnostics.AdditionalDetails
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.presentation.UsbServiceListener
@@ -38,10 +32,7 @@ class DiagnosticsFragment : Fragment() {
     private var resultData: String = ""
     private val messages = MutableLiveData<String>()
     private var startListening = MutableLiveData(false)
-    private val batteryStatus: Intent? =
+
-        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
-            context?.registerReceiver(null, ifilter)
-        }
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
     ): View {
@@ -65,25 +56,7 @@ class DiagnosticsFragment : Fragment() {
         binding.btnSubmit.setOnClickListener {
             binding.btnSubmit.visibility = View.GONE
             runDeviceDiagnostics()
-            val batteryLevel = "" //diagnosticsViewModel.getBatteryLevel().toString()
-            val batteryCapacity = "" //context?.let { diagnosticsViewModel.getBatteryCapacity(it).toString() }
-            val batteryMaxCapacity = "" //context?.let { diagnosticsViewModel.getBatteryMaxCapacity(it).toString() }
-            val batteryTemperature = "" //diagnosticsViewModel.getBatteryTemperature().toString()
-            val batteryVoltage = "" // context?.let { diagnosticsViewModel.getBatteryVoltage(it).toString() }
-
-            val additionalDetails = AdditionalDetails(
-                batteryLevel = batteryLevel,
-                batteryCapacity = batteryCapacity!!,
-                batteryMaxCapacity = batteryMaxCapacity!!,
-                batteryTemperature = batteryTemperature,
-                batteryVoltage = batteryVoltage!!
-            )
-            diagnosticsViewModel.deviceDiagnostics(
-                DeviceDiagnosticsRequest(additionalDetails = additionalDetails)
-            )
         }
-
-
     }
 
 
@@ -95,7 +68,7 @@ class DiagnosticsFragment : Fragment() {
 
         messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
-            Log.e("diagnostics", binding.tvSubtitle4.text.toString())
+            Log.e("diagnostics",binding.tvSubtitle4.text.toString())
         }
 
         diagnosticsViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
@@ -108,42 +81,6 @@ class DiagnosticsFragment : Fragment() {
 
             binding.progressBar.visibility = View.GONE
         }
-
-        diagnosticsViewModel.deviceDiagnosticsResponse.observe(viewLifecycleOwner) { response ->
-            when (response) {
-                is Success -> {
-                    if (response.data.result == "Success") {
-                        Toast.makeText(
-                            activity, response.data.message ?: "Device diagnostics uploaded successfully", Toast.LENGTH_LONG
-                        ).show()
-
-                        response.data.data?.let { diagnosticsData ->
-
-                            val batteryLevel = diagnosticsData.additionalDetails?.batteryLevel
-
-                        }
-                    } else {
-                        Toast.makeText(
-                            activity,
-                            "${response.data.message}",
-                            Toast.LENGTH_LONG
-                        ).show()
-                    }
-                }
-                is Result.Error -> {
-                    // Handle the error scenario
-                    Toast.makeText(
-                        activity,
-                        "An error occurred: ${response.exception.message}",
-                        Toast.LENGTH_LONG
-                    ).show()
-                }
-                is Result.Loading -> {
-                }
-            }
-        }
-
-
     }
 
     private fun getDeviceId() {
@@ -158,7 +95,6 @@ class DiagnosticsFragment : Fragment() {
                         binding.tvSubtitle4.text = stringData
                     }
                 }
-
                 override fun onUsbError(e: Exception?) {
                     diagnosticsViewModel.progressBar.postValue(false)
                 }
@@ -171,23 +107,22 @@ class DiagnosticsFragment : Fragment() {
             HemoCubeCommands.DIAGNOSTICS_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
-                }
 
+
+                }
                 override fun onUsbError(e: Exception?) {
                     diagnosticsViewModel.progressBar.postValue(false)
                 }
             })
     }
 
-
     private fun listenToHemoCube() {
 
         val fullReadOutput = StringBuilder()
         startListening.postValue(true)
 
         try {
-            (activity as DiagnosticsActivity).mService.listenToHemoCube(object :
+            (activity as DiagnosticsActivity).mService.listenToHemoCube(object : UsbServiceListener {
-                UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
                         val stringData = String(it)
@@ -211,28 +146,16 @@ class DiagnosticsFragment : Fragment() {
                     }
 
                     if (resultData.contains("END") || fullReadOutput.contains("END")) {
-                        diagnosticsViewModel.addDiagnosticsDataToDb(
+                        diagnosticsViewModel.addDiagnosticsDataToDb(DiagnosticsData(
-                            DiagnosticsData(
+                            deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-                                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
+                            devicePassword = sharedPreferences.getString(Constants.DEVICE_PASSWORD_API, "").toString(),
-                                    .toString(),
+                            deviceNatsToken = sharedPreferences.getString(Constants.NATS_TOKEN, "").toString(),
-                                devicePassword = sharedPreferences.getString(
+                            accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString(),
-                                    Constants.DEVICE_PASSWORD_API,
-                                    ""
-                                ).toString(),
-                                deviceNatsToken = sharedPreferences.getString(
-                                    Constants.NATS_TOKEN,
-                                    ""
-                                ).toString(),
-                                accessToken = sharedPreferences.getString(
-                                    Constants.ACCESS_TOKEN,
-                                    ""
-                                ).toString(),
                             deviceData = resultData,
                             runTime = SimpleDateFormat(
                                 "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                             ).format(Calendar.getInstance().time)
-                            )
+                        ))
-                        )
                     }
 //                    val inputData = mutableListOf<String>()
 //                    while (true) {
@@ -255,6 +178,7 @@ class DiagnosticsFragment : Fragment() {
         }
     }
 
+
     fun parseData(inputData: List<String>): List<Pair<String, String>> {
         val pattern = Regex("([A-Z]+)\\s(\\d+)")
         val parsedData = mutableListOf<Pair<String, String>>()

app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsViewModel.kt

@@ -3,21 +3,16 @@ package com.example.hpostesting.presentation.diagnostics
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.repository.Repository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
-
 @HiltViewModel
 class DiagnosticsViewModel @Inject constructor(
-    private val repository: Repository,
+    private val repository: Repository
-//    context: Context,
 ) : ViewModel() {
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
@@ -25,11 +20,7 @@ class DiagnosticsViewModel @Inject constructor(
 
     val deviceData = MutableLiveData<DeviceData?>()
     val fireBaseUpload = MutableLiveData<String>()
-    val deviceDiagnosticsResponse = MutableLiveData<com.example.hpostesting.data.Result<DeviceDiagnosticsResponse>>()
+
-//    private val batteryStatus: Intent? =
-//        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
-//            context.registerReceiver(null, ifilter)
-//        }
     fun addDiagnosticsDataToDb(data: DiagnosticsData) {
         viewModelScope.launch {
             try {
@@ -52,81 +43,4 @@ class DiagnosticsViewModel @Inject constructor(
             }
         }
     }
-
-
-    fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest) = viewModelScope.launch {
-        deviceDiagnosticsResponse.postValue(Result.Loading())
-        repository.deviceDiagnostics(deviceDiagnosticsRequest).let {
-            deviceDiagnosticsResponse.postValue(it)
-        }
-    }
-
-
-//    fun getBatteryLevel(): Float? {
-//        val batteryPct: Float? = batteryStatus?.let { intent ->
-//            val level: Int =
-//                intent.getIntExtra(
-//                    BatteryManager.EXTRA_LEVEL,
-//                    -1
-//                )
-//            val scale: Int =
-//                intent.getIntExtra(
-//                    BatteryManager.EXTRA_SCALE,
-//                    -1
-//                )
-//            level * 100 / scale.toFloat()
-//        }
-//
-//        return batteryPct
-//    }
-//
-//    fun getBatteryTemperature(): Float? {
-//        val batteryTemp: Float? = batteryStatus?.let { intent ->
-//            val temperature = intent.getIntExtra(
-//                BatteryManager.EXTRA_TEMPERATURE,
-//                0
-//            )
-//            temperature.toFloat() / 10
-//        }
-//
-//        return batteryTemp
-//    }
-//
-//    fun getBatteryVoltage(context: Context): Float {
-//        val batteryIntent =
-//            context.registerReceiver(
-//                null,
-//                IntentFilter(Intent.ACTION_BATTERY_CHANGED)
-//            )
-//        val voltage = batteryIntent?.getIntExtra(
-//            BatteryManager.EXTRA_VOLTAGE,
-//            0
-//        ) ?: 0
-//
-//        // milli-volts to volts
-//        return voltage.toFloat() / 1000
-//    }
-//
-//
-//    fun getBatteryCapacity(context: Context): Int {
-//        val batteryManager =
-//            context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-//        val currentCapacity =
-//            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-//
-//        return currentCapacity
-//    }
-//
-//    fun getBatteryMaxCapacity(context: Context): Float {
-//        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-//        val designCapacity =
-//            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-//        val currentCapacity =
-//            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-//
-//        // Calculate the estimated maximum battery capacity in mAh
-//        val maxCapacity = currentCapacity.toFloat() / designCapacity.toFloat() * 100
-//
-//        return maxCapacity
-//    }
 }

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

@@ -1,10 +1,25 @@
 package com.example.hpostesting.presentation.hemocube
 
+import android.content.BroadcastReceiver
+import android.content.ComponentName
 import android.content.Context
-import android.os.Bundle
+import android.content.Intent
+import android.content.ServiceConnection
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbDeviceConnection
+import android.hardware.usb.UsbManager
 import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.os.IBinder
+import android.view.Menu
+import androidx.activity.viewModels
+import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.presentation.testRight.UsbService
+import com.hoho.android.usbserial.driver.UsbSerialDriver
+import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDigitalCardBinding
+import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
 
 class DigitalCardActivity : AppCompatActivity() {
 
@@ -23,10 +38,10 @@ class DigitalCardActivity : AppCompatActivity() {
         moveToNext()
     }
 
+
     private fun moveToNext() {
         if (supportFragmentManager.isDestroyed) return
-        supportFragmentManager.beginTransaction()
+        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, DigitalCardFragment())
-            .replace(binding.fghemocube.id, DigitalCardFragment())
             .commit()
     }
 }

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

@@ -5,14 +5,16 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.util.Log
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
+import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentDigitalCardBinding
+import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
@@ -59,16 +61,14 @@ class DigitalCardFragment : Fragment() {
             binding.State.text = "State: ${testDetails?.state}"
             binding.abhaid.text = "ABHA ID: ${testDetails?.abhaId}"
             binding.blood.text = "Blood Group: ${testDetails?.bloodGroup}"
-            binding.sicklecell.text =
+            binding.sicklecell.text = "Sickle-Cell: ${DataHolder.hemoCubeTestData?.prdClassification.toString()}"
-                "Sickle-Cell: ${DataHolder.hemoCubeTestData?.prdClassification.toString()}"
+
         }
         // Update the UI with the fetched details
         val originalDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-        val originalDate: Date? = originalDateFormat.parse(
+        val originalDate: Date? = originalDateFormat.parse(SimpleDateFormat(
-            SimpleDateFormat(
             "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-            ).format(Calendar.getInstance().time)
+        ).format(Calendar.getInstance().time))
-        )
 
 // Format the parsed date to "mm date, year"
         val desiredDateFormat = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault())

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

@@ -1,6 +1,5 @@
 package com.example.hpostesting.presentation.hemocube
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -91,11 +90,8 @@ class HemoCubeFragment : Fragment() {
         observeViewModel()
     }
 
-    @SuppressLint("SetTextI18n")
     private fun initViews() {
         binding.btnSubmit.setOnClickListener {
-            binding.btnSubmit.isEnabled = false
-            binding.btnSubmit.isClickable = false
             activity?.runOnUiThread {
                 binding.progressBar.visibility = View.VISIBLE
                 binding.btnSubmit.visibility = View.GONE
@@ -110,6 +106,8 @@ class HemoCubeFragment : Fragment() {
         binding.nameEditText.visibility = View.GONE
         binding.tvTitle.visibility = View.GONE
         binding.btnGo.visibility = View.GONE
+//        binding.btnSubmit.isEnabled = false
+//        binding.btnSubmit.isClickable = false
         binding.btnPlacebuffer.visibility = View.GONE
 
         binding.tvName.text = "Name: ${testDetails?.name}\n ID: ${testDetails?._id}"
@@ -136,6 +134,7 @@ class HemoCubeFragment : Fragment() {
                 checkAndStartProcess()
                 it.visibility = View.GONE
             }
+
         }
 
         if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
@@ -150,28 +149,24 @@ class HemoCubeFragment : Fragment() {
             if (result == "Success") {
                 uploadedToCloud = true
                 showToast(R.string.test_upload)
-                if (Constants.MOLBIO_INTEGRATION) {
                 hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
                     when (it) {
                         is Result.Success -> {
                             uploadedToMolbio = true
+                            if (Constants.MOLBIO_INTEGRATION) {
                                 it.data.data?.get(0)?.rawData?.let { it1 ->
                                     hemoCubeViewModel.updateMolbioFlag(
                                         it1._id
                                     )
                                 }
+                            }
                             handleReadingFinish()
                         }
-
                         is Result.Error -> {
                             binding.btnSubmit.visibility = View.VISIBLE
                             //Remove this line of code while deploying to IOCL
                             it.exception.let { message ->
-                                    Toast.makeText(
+                                Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
-                                        activity,
-                                        "An error occurred: $message",
-                                        Toast.LENGTH_LONG
-                                    )
                                     .show()
                             }
                             handleReadingFinish()
@@ -180,9 +175,6 @@ class HemoCubeFragment : Fragment() {
                         else -> {}
                     }
                 }
-                } else {
-                    handleReadingFinish()
-                }
             }
             if (result == "Local") {
                 showToast(R.string.internt_not_local)
@@ -364,20 +356,6 @@ class HemoCubeFragment : Fragment() {
             })
     }
 
-    private fun loadDACValues() {
-        hemoCubeViewModel.progressBar.postValue(true)
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.LOAD_DAC_VALUES,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hemoCubeViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
     fun handleUsbData(stringData: String) {
         if (stringData.contains("#")) {
             isTestOngoing = true
@@ -390,7 +368,6 @@ class HemoCubeFragment : Fragment() {
         when {
             resultData.contains("SNE") && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
                 processV2HardwareId(resultData)
-                loadDACValues()
             }
 
             (resultData.contains("SN") && !resultData.contains("SNS") && !resultData.contains("SNE") && resultData.length >= 15) && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
@@ -410,12 +387,6 @@ class HemoCubeFragment : Fragment() {
                 fetchResult()
             }
 
-            (resultData.contains("#RC") && this.testStatusCode < TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code) -> {
-                this.testStatusCode = TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code
-                hemoCubeViewModel.messages.postValue("EPROM ADC Loaded")
-                showStartBufferButton()
-            }
-
             resultData.contains("#BS") && this.testStatusCode < TestStatus.BUFFER_STARTED.code -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.buffer_started))
                 this.testStatusCode = TestStatus.BUFFER_STARTED.code
@@ -440,8 +411,7 @@ class HemoCubeFragment : Fragment() {
             (resultData.contains("#SC") || resultData.contains("#SC1")) && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.code -> {
                 this.testStatusCode = TestStatus.SAMPLE_COMPLETED.code
                 hemoCubeViewModel.messages.postValue(
-                    getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data)
+                    getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data))
-                )
                 fetchResult()
                 currentResultData = ""
             }
@@ -549,8 +519,7 @@ class HemoCubeFragment : Fragment() {
                     led1Gain1 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                     led2Gain1 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
                     led3Gain1 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-                    led4Gain1 =
+                    led4Gain1 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
-                        resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
                 }
 
                 sendSecondGainCommand()
@@ -568,8 +537,7 @@ class HemoCubeFragment : Fragment() {
                     led1Gain2 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                     led2Gain2 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
                     led3Gain2 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-                    led4Gain2 =
+                    led4Gain2 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
-                        resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
                 }
 
                 sendForthGainCommand()
@@ -597,7 +565,6 @@ class HemoCubeFragment : Fragment() {
 
     fun finishReading() {
         repeatReadingCount += 1
-        isTestOngoing = false
 
         if (readingsPerSample == 1) {
             activity?.runOnUiThread {
@@ -666,6 +633,10 @@ class HemoCubeFragment : Fragment() {
 
         if (!hardwareId.isNullOrBlank()) {
             updateDeviceId(hardwareId)
+            activity?.runOnUiThread {
+                binding.btnPlacebuffer.visibility = View.VISIBLE
+            }
+            hemoCubeViewModel.messages.postValue(getString(R.string.start))
         } else {
             hemoCubeViewModel.messages.postValue("Config error")
         }
@@ -679,13 +650,6 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
-    fun showStartBufferButton() {
-        activity?.runOnUiThread {
-            binding.btnPlacebuffer.visibility = View.VISIBLE
-        }
-        hemoCubeViewModel.messages.postValue(getString(R.string.start))
-    }
-
     fun extractV1HardwareId(input: String): String? {
         val regex = Regex("SN (\\S+)")
         val matchResult = regex.find(input)
@@ -698,10 +662,10 @@ class HemoCubeFragment : Fragment() {
 
         if (!hardwareId.isNullOrBlank()) {
             updateDeviceId(hardwareId)
-//            activity?.runOnUiThread {
+            activity?.runOnUiThread {
-//                binding.btnPlacebuffer.visibility = View.VISIBLE
+                binding.btnPlacebuffer.visibility = View.VISIBLE
-//            }
+            }
-//            hemoCubeViewModel.messages.postValue(getString(R.string.start))
+            hemoCubeViewModel.messages.postValue(getString(R.string.start))
         } else {
             hemoCubeViewModel.messages.postValue("Config error")
         }
@@ -718,10 +682,10 @@ class HemoCubeFragment : Fragment() {
     fun assignDefaultDevice(configData: String) {
         deviceHardwareId = "HCV-000-3001"
         testStatusCode = TestStatus.CONFIG_COMPLETED.code
-//        activity?.runOnUiThread {
+        activity?.runOnUiThread {
-//            binding.btnPlacebuffer.visibility = View.VISIBLE
+            binding.btnPlacebuffer.visibility = View.VISIBLE
-//        }
+        }
-//        hemoCubeViewModel.messages.postValue(getString(R.string.start))
+        hemoCubeViewModel.messages.postValue(getString(R.string.start))
     }
 
     fun extractV2HardwareId(input: String): String? {
@@ -765,7 +729,6 @@ class HemoCubeFragment : Fragment() {
             val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
             val led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
             val deviceRatio = led2Average / led1Average
-            val borderlineMetric = (led1Average - led2Average) / deviceRatio
 
             if (led1BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
                     ?.get(0)!!
@@ -842,7 +805,7 @@ class HemoCubeFragment : Fragment() {
 
             calculatedPredictedDenovixRatio = fittedAbs3.div(fittedAbs1)
 
-            val slope = (led4Average - led1Average) / (431 - 411)
+            val slope = (led4Average - led1Average) / (431-411)
             val calculatedSlopeRatio = abs(led2Average / slope)
             val slopeClass = slopeRatioClassification(calculatedSlopeRatio)
 
@@ -863,7 +826,7 @@ class HemoCubeFragment : Fragment() {
                 }
             }
 
-            val absorbanceLowerLimit = 0.0
+            var absorbanceLowerLimit = 0.0
             if (led1Average < absorbanceLowerLimit || led2Average < absorbanceLowerLimit || led3Average < absorbanceLowerLimit || led4Average < absorbanceLowerLimit) {
                 validationError = true
                 activity?.runOnUiThread {
@@ -910,20 +873,9 @@ class HemoCubeFragment : Fragment() {
                     .toString() + ", " + currentDeviceData?.coefficients?.get(1).toString()
                 this.prdClassification = absorbanceBasedClassification(predictedDenovixRatio)
                 this.deviceRatioClass = deviceRatioClassification(deviceRatio)
-                this.borderlineMethod2Class = reclassifyWithBorderlineMethod2(deviceRatio, deviceRatioBorderlineThresholds(deviceRatio), led2Average)
                 this.slopeRatioClass = slopeClass
-                this.classificationResult = findResultWithAdditionalMethods(
+                this.classificationResult = deviceRatioClass
-                    deviceRatio,
+                hemoCubeViewModel.messages.postValue("${this.classificationResult} \n Device Ratio: ${"%.3f".format(this.deviceRatio)}")
-                    deviceRatioClass,
-                    borderlineMetric
-                )
-                hemoCubeViewModel.messages.postValue(
-                    "${this.classificationResult} \n Device Ratio: ${
-                        "%.3f".format(
-                            this.deviceRatio
-                        )
-                    }"
-                )
                 if (DataHolder.hemoCubeTestData?.testType == "HB")
                     hemoCubeViewModel.messages.postValue("Hb: $calculatedHb4")
                 this.errorMessages = testState.allErrorMessages
@@ -957,48 +909,13 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
-    fun reclassifyWithBorderlineMethod2(deviceRatio: Double?, deviceRatioClass: String?, led2Average: Double?): String {
+    fun findResultWithAdditionalMethods(deviceRatio: Double?, deviceRatioClass: String?, slopeRatio: Double?): String {
-        try {
-            if (deviceRatio != null && led2Average != null) {
-                if (deviceRatioClass == "Negative Borderline") {
-                    return if (led2Average >= 0.15)
-                        "Borderline. Normal"
-                    else
-                        "Borderline. Sickle Cell Trait"
-                }
-                if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
-                    return if (led2Average >= 0.19)
-                        "Borderline. Sickle Cell Trait"
-                    else
-                        "Borderline. Sickle Cell Disease"
-                }
-            }
-        } catch (e: Exception) {
-            handleException(e)
-            return "Error"
-        }
-        return deviceRatioClass.toString()
-    }
-
-    fun findResultWithAdditionalMethods(
-        deviceRatio: Double?,
-        deviceRatioClass: String?,
-        borderlineMetric: Double?,
-    ): String {
         try {
 //            hemoCubeViewModel.messages.postValue("post classification checks")
-            if (deviceRatio != null && borderlineMetric != null) {
+            if (deviceRatio != null) {
-                if (deviceRatioClass == "Negative Borderline") {
+                if (slopeRatio != null) {
-                    return if (borderlineMetric >= 2.4)
+                    if (deviceRatioClass == "Normal" && slopeRatio > 45.0)
-                        "Borderline. Normal"
+                        return "Negative Borderline, Repeat Test"
-                    else
-                        "Borderline. Sickle Cell Trait"
-                }
-                if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
-                    return if (borderlineMetric >= 1.34)
-                        "Borderline. Sickle Cell Trait"
-                    else
-                        "Borderline. Sickle Cell Disease"
                 }
             }
         } catch (e: Exception) {
@@ -1008,46 +925,20 @@ class HemoCubeFragment : Fragment() {
         return deviceRatioClass.toString()
     }
 
-    fun deviceRatioBorderlineThresholds(ratio: Double?): String {
-        try {
-            if (ratio != null) {
-                val roundedRatio = String.format("%.3f", ratio).toDouble()
-                if (roundedRatio >= 0.11 && roundedRatio < 0.237) {
-//                    setSubtitleTextColor(R.color.green_2)
-                    return "Normal"
-                }
-                if (roundedRatio in 0.237..0.242)
-                    return "Negative Borderline"
-                if (roundedRatio in 0.242..0.318)
-                    return "Sickle Cell Trait"
-                if (roundedRatio >= 0.318 && roundedRatio < 0.356)
-                    return "Positive for Sickle Cell. HPLC for Confirmation"
-                if (roundedRatio in 0.356..0.7)
-                    return "Sickle Cell Disease"
-            } else {
-                return "Invalid"
-            }
-        } catch (e: Exception) {
-            handleException(e)
-            return "Error"
-        }
-        return "Invalid"
-    }
-
     fun deviceRatioClassification(ratio: Double?): String {
         try {
             if (ratio != null) {
-                if (ratio in 0.16..0.23) {
+                if (ratio in 0.016..0.22) {
 //                    setSubtitleTextColor(R.color.green_2)
                     return "Normal"
                 }
-                if (ratio in 0.23..0.25)
+                if (ratio in 0.22..0.24)
                     return "Negative Borderline"
-                if (ratio in 0.25..0.31)
+                if (ratio in 0.24..0.32)
                     return "Sickle Cell Trait"
-                if (ratio in 0.31..0.36)
+                if (ratio in 0.32..0.37)
                     return "Positive for Sickle Cell. HPLC for Confirmation"
-                if (ratio in 0.36..0.7)
+                if (ratio in 0.37..0.56)
                     return "Sickle Cell Disease"
             } else {
                 return "Invalid"

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

@@ -88,7 +88,6 @@ class HemoCubeViewModel @Inject constructor(
 
     private val _networkStatusLiveData = NetworkStatusLiveData(context)
     val allUserData = hemoCubeDao.getAll()
-    val allPendingUserToUpload = MutableLiveData<List<HemoCubeTestData>>()
     val allKitTestData = hemoCubeBufferDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
 
@@ -143,6 +142,9 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
+
+
+
     fun checkUpdate(checkUpdateRequest: CheckUpdateRequest) = viewModelScope.launch {
         checkUpdate.postValue(Result.Loading())
         repository.checkUpdate(checkUpdateRequest).let {
@@ -157,6 +159,7 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
+
     fun downloadClientCertificate() = viewModelScope.launch {
         downloadcertificate.postValue(Result.Loading())
         repository.downloadClientCertificate().let {
@@ -164,6 +167,9 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
+
+
+
     fun startPeriodicCheckUpdate() {
         val periodicRequest = PeriodicWorkRequestBuilder<CheckUpdateWorker>(
             repeatInterval = 1, repeatIntervalTimeUnit = TimeUnit.MINUTES
@@ -187,9 +193,6 @@ class HemoCubeViewModel @Inject constructor(
             }
         }
     }
-    fun uploadPendingUser() = viewModelScope.launch {
-        allPendingUserToUpload.postValue(hemoCubeDao.getPendingUser(false))
-    }
 
     fun uploadHemoCubeResultToDatabaseForBufferCheck(
         isOnline: Boolean,
@@ -294,7 +297,6 @@ class HemoCubeViewModel @Inject constructor(
         testDetails?.prdClassification = DataHolder.hemoCubeTestData?.prdClassification.toString()
         testDetails?.deviceRatioClass = DataHolder.hemoCubeTestData?.deviceRatioClass.toString()
         testDetails?.slopeRatioClass = DataHolder.hemoCubeTestData?.slopeRatioClass.toString()
-        testDetails?.borderlineMethod2Class = DataHolder.hemoCubeTestData?.borderlineMethod2Class.toString()
         testDetails?.errorMessages = DataHolder.hemoCubeTestData?.errorMessages.toString()
         testDetails?.batteryLevel = DataHolder.hemoCubeTestData?.batteryLevel.toString()
         testDetails?.batteryCapacity = DataHolder.hemoCubeTestData?.batteryCapacity.toString()
@@ -324,7 +326,6 @@ class HemoCubeViewModel @Inject constructor(
                         Log.i("Testdb", "Data uploaded to Firestore successfully")
                         fireBaseUpload.postValue("Success")
                         testDetails.localFlag = true
-                        if (Constants.MOLBIO_INTEGRATION) {
                         uploadResult(
                             MolbioV2ResultRequest(
                                 mutableListOf(
@@ -343,7 +344,6 @@ class HemoCubeViewModel @Inject constructor(
                                 )
                             )
                         )
-                        }
                         hemoCubeDao.insertAll(testDetails)
                     }
 
@@ -412,8 +412,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}")

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

@@ -11,12 +11,14 @@ import android.content.ServiceConnection
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
+import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
 import android.view.Menu
 import android.widget.Toast
 import androidx.activity.viewModels
+import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
@@ -43,6 +45,7 @@ open class HemocubeActivity : AppCompatActivity() {
     private val TAG = "HemoCube"
 
     private val broadcastReceiver = object : BroadcastReceiver() {
+        @RequiresApi(Build.VERSION_CODES.O)
         override fun onReceive(context: Context, intent: Intent) {
 
             synchronized(this) {
@@ -61,7 +64,6 @@ open class HemocubeActivity : AppCompatActivity() {
 
         }
     }
-
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as UsbService.UsbServiceBinder
@@ -75,13 +77,14 @@ open class HemocubeActivity : AppCompatActivity() {
             viewModel.isServiceConnected = false
         }
     }
-
     override fun attachBaseContext(newBase: Context?) {
         val languageCode = LanguageManager.getSavedLanguage(newBase!!)
         LanguageManager.setLocale(newBase, languageCode)
         super.attachBaseContext(newBase)
     }
 
+
+    @RequiresApi(Build.VERSION_CODES.O)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHemocubeBinding.inflate(layoutInflater)
@@ -106,6 +109,7 @@ open class HemocubeActivity : AppCompatActivity() {
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     open fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
@@ -125,32 +129,41 @@ open class HemocubeActivity : AppCompatActivity() {
         }
     }
 
-    @SuppressLint("MutableImplicitPendingIntent")
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    @SuppressLint("UnspecifiedImmutableFlag")
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
         val mPendingIntent: PendingIntent
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+        val pendingIntentFlags = when {
-            mPendingIntent = PendingIntent.getBroadcast(
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-                this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
+                PendingIntent.FLAG_IMMUTABLE
-            )
+            }
-        } else {
+            else -> {
+                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+            }
+        }
+
         mPendingIntent = PendingIntent.getBroadcast(
             this,
             0,
             Intent(Constants.HEMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+            pendingIntentFlags
         )
-        }
 
         val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
+        registerReceiver(broadcastReceiver, filter, RECEIVER_EXPORTED)
+
+        // Request permission
         manager.requestPermission(device, mPendingIntent)
     }
 
+
     fun setupService() {
         val intent = Intent(this, UsbService::class.java)
         bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     open fun reconnectDevice() {
         mService.disconnect()
         unbindService(connection)
@@ -175,6 +188,7 @@ open class HemocubeActivity : AppCompatActivity() {
         }
     }
 
+
     fun onErrorReported(msg: String) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
         if (!isFinishing) onBackPressed()