Compare commits
2 Commits
DEV_UAT
...
release-v1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1f264c299b | ||
|
|
19fcc13b2a |
@@ -16,11 +16,11 @@ android {
|
|||||||
|
|
||||||
// prod - production, preprod - preproduction, quality - qc
|
// prod - production, preprod - preproduction, quality - qc
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "in.sminnovations.hpostesting"
|
applicationId "in.sminnovations.hpostesting.dev"
|
||||||
minSdk 21
|
minSdk 21
|
||||||
targetSdk 34
|
targetSdk 34
|
||||||
versionCode 56
|
versionCode 76
|
||||||
versionName "2.1.56"
|
versionName "2.1.76"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -73,7 +73,8 @@ object Constants {
|
|||||||
"HCV-000-3007",
|
"HCV-000-3007",
|
||||||
"HCV-000-3008",
|
"HCV-000-3008",
|
||||||
"HCV-000-3009",
|
"HCV-000-3009",
|
||||||
"HCV-000-3010"
|
"HCV-000-3010",
|
||||||
|
"HPP1-0124-0001"
|
||||||
)
|
)
|
||||||
|
|
||||||
const val password = "SMI@12345"
|
const val password = "SMI@12345"
|
||||||
@@ -103,7 +104,7 @@ object Constants {
|
|||||||
const val TEST_STATUS_CODE_TEST_COMPLETED = 12.0
|
const val TEST_STATUS_CODE_TEST_COMPLETED = 12.0
|
||||||
|
|
||||||
val DEVICE_CONFIGURATION: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
|
val DEVICE_CONFIGURATION: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
|
||||||
"HCV-000-3001" to listOf(
|
"HPP1-0124-0001" to listOf(
|
||||||
listOf(1.313, -0.89), // LED1, 435nm
|
listOf(1.313, -0.89), // LED1, 435nm
|
||||||
listOf(0.581462456, -0.58502), // LED2, 415nm
|
listOf(0.581462456, -0.58502), // LED2, 415nm
|
||||||
listOf(0.2012, 0.0092), // LED3, 555nm
|
listOf(0.2012, 0.0092), // LED3, 555nm
|
||||||
@@ -128,21 +129,21 @@ object Constants {
|
|||||||
listOf(1.0, 0.0) // LED4
|
listOf(1.0, 0.0) // LED4
|
||||||
),
|
),
|
||||||
"HCV-000-3005" to listOf(
|
"HCV-000-3005" to listOf(
|
||||||
listOf(1.7272, -1.1977), // LED1, 435nm
|
listOf(1.3801, -0.372), // LED1, 435nm
|
||||||
listOf(0.581462456, -0.58502), // LED2, 415nm
|
listOf(0.581462456, -0.58502), // LED2, 415nm
|
||||||
listOf(0.2304, -0.0145), // LED3, 555nm
|
listOf(0.4565, -0.0371), // LED3, 555nm
|
||||||
listOf(1.0, 0.0) // LED4
|
listOf(1.0, 0.0) // LED4
|
||||||
),
|
),
|
||||||
"HCV-000-3006" to listOf(
|
"HCV-000-3006" to listOf(
|
||||||
listOf(1.7272, -1.1977), // LED1, 435nm
|
listOf(1.3801, -0.372), // LED1, 435nm
|
||||||
listOf(0.581462456, -0.58502), // LED2, 415nm
|
listOf(0.581462456, -0.58502), // LED2, 415nm
|
||||||
listOf(0.2304, -0.0145), // LED3, 555nm
|
listOf(0.4565, -0.0371), // LED3, 555nm
|
||||||
listOf(1.0, 0.0) // LED4
|
listOf(1.0, 0.0) // LED4
|
||||||
),
|
),
|
||||||
"HCV-000-3007" to listOf(
|
"HCV-000-3007" to listOf(
|
||||||
listOf(1.7272, -1.1977), // LED1, 435nm
|
listOf(1.8445, -0.8213), // LED1, 435nm
|
||||||
listOf(0.581462456, -0.58502), // LED2, 415nm
|
listOf(0.581462456, -0.58502), // LED2, 415nm
|
||||||
listOf(0.2304, -0.0145), // LED3, 555nm
|
listOf(0.4613, -0.0831), // LED3, 555nm
|
||||||
listOf(1.0, 0.0) // LED4
|
listOf(1.0, 0.0) // LED4
|
||||||
),
|
),
|
||||||
"HCV-000-3008" to listOf(
|
"HCV-000-3008" to listOf(
|
||||||
@@ -170,7 +171,7 @@ object Constants {
|
|||||||
const val BATTERY_LEVEL_MIN = 0
|
const val BATTERY_LEVEL_MIN = 0
|
||||||
|
|
||||||
val BUFFER_INTENSITY_THRESHOLDS: Map<String, List<List<Int>>> = mapOf<String, List<List<Int>>>(
|
val BUFFER_INTENSITY_THRESHOLDS: Map<String, List<List<Int>>> = mapOf<String, List<List<Int>>>(
|
||||||
"HCV-000-3001" to listOf(
|
"HPP1-0124-0001" to listOf(
|
||||||
listOf(20000, 25074),
|
listOf(20000, 25074),
|
||||||
listOf(20000, 24596),
|
listOf(20000, 24596),
|
||||||
listOf(20000, 26065),
|
listOf(20000, 26065),
|
||||||
|
|||||||
@@ -304,11 +304,11 @@ class HemoCubeFragment : Fragment() {
|
|||||||
|
|
||||||
when {
|
when {
|
||||||
resultData.contains("SNE") && this.testStatusCode < Constants.TEST_STATUS_CODE_CONFIG_COMPLETED -> {
|
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 matchResult = pattern.find(resultData)
|
||||||
val hardwareId = matchResult?.value
|
val hardwareId = matchResult?.value
|
||||||
|
|
||||||
if (hardwareId.toString().length == 12) {
|
if (hardwareId.toString().length == 14) {
|
||||||
deviceHardwareId += hardwareId
|
deviceHardwareId += hardwareId
|
||||||
with(sharedPreferences.edit()) {
|
with(sharedPreferences.edit()) {
|
||||||
putString(Constants.DEVICE_ID, deviceHardwareId)
|
putString(Constants.DEVICE_ID, deviceHardwareId)
|
||||||
|
|||||||
Reference in New Issue
Block a user