From 1f264c299babcd4c7f8bad6e8cc112d7ee0335e9 Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Tue, 9 Jan 2024 18:15:48 +0530 Subject: [PATCH] add new device ids --- app/build.gradle | 6 +++--- .../com/example/hpostesting/data/constant/Constants.kt | 7 ++++--- .../hpostesting/presentation/hemocube/HemoCubeFragment.kt | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b96b05e..ae618c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,11 +16,11 @@ android { // prod - production, preprod - preproduction, quality - qc defaultConfig { - applicationId "in.sminnovations.hpostesting.preprod" + applicationId "in.sminnovations.hpostesting.dev" minSdk 21 targetSdk 34 - versionCode 61 - versionName "2.1.61" + versionCode 76 + versionName "2.1.76" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt index 5f65f52..6f1864f 100644 --- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt +++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt @@ -73,7 +73,8 @@ object Constants { "HCV-000-3007", "HCV-000-3008", "HCV-000-3009", - "HCV-000-3010" + "HCV-000-3010", + "HPP1-0124-0001" ) const val password = "SMI@12345" @@ -103,7 +104,7 @@ object Constants { const val TEST_STATUS_CODE_TEST_COMPLETED = 12.0 val DEVICE_CONFIGURATION: Map>> = mapOf>>( - "HCV-000-3001" to listOf( + "HPP1-0124-0001" to listOf( listOf(1.313, -0.89), // LED1, 435nm listOf(0.581462456, -0.58502), // LED2, 415nm listOf(0.2012, 0.0092), // LED3, 555nm @@ -170,7 +171,7 @@ object Constants { const val BATTERY_LEVEL_MIN = 0 val BUFFER_INTENSITY_THRESHOLDS: Map>> = mapOf>>( - "HCV-000-3001" to listOf( + "HPP1-0124-0001" to listOf( listOf(20000, 25074), listOf(20000, 24596), listOf(20000, 26065), diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt index 7128812..71be6a5 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt @@ -304,11 +304,11 @@ class HemoCubeFragment : Fragment() { when { resultData.contains("SNE") && this.testStatusCode < Constants.TEST_STATUS_CODE_CONFIG_COMPLETED -> { - val pattern = Regex("HCV-\\d{3}-\\d{4}") + val pattern = Regex("HPP1-\\d{4}-\\d{4}") val matchResult = pattern.find(resultData) val hardwareId = matchResult?.value - if (hardwareId.toString().length == 12) { + if (hardwareId.toString().length == 14) { deviceHardwareId += hardwareId with(sharedPreferences.edit()) { putString(Constants.DEVICE_ID, deviceHardwareId)