From 11d4c99e02fc55a9f54801ad4ef01b2d0109a1aa Mon Sep 17 00:00:00 2001 From: Kaif Date: Thu, 14 Dec 2023 16:56:39 +0530 Subject: [PATCH] Changes for new Arduieno Device --- .../example/hpostesting/data/constant/Constants.kt | 4 ++-- .../presentation/hemocube/HemoCubeFragment.kt | 12 ++++++++++-- app/src/main/res/xml/device_filter.xml | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) 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 1ddf250..6e151d2 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 @@ -27,8 +27,8 @@ object Constants { const val DEVICE_TYPE_TEST_RIGHT = "TEST_RIGHT" const val DEVICE_VENDOR_ID = 1027 - const val HOMO_CUBE_ID = 29987 - const val VENDOR_ID = 6790 + const val HOMO_CUBE_ID = 24577 + const val VENDOR_ID = 1027 const val ERROR_NORMAL = 400 const val ERROR_CRITICAL = 401 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 9dc327e..cf5b65a 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 @@ -294,13 +294,21 @@ class HemoCubeFragment : Fragment() { resultData += stringData when { - stringData.contains("SN") -> { + stringData.contains("SNS") -> { val slData = stringData.split(" ") if (slData.size > 1) { val hardwareId = slData[1].trim() deviceHardwareId = hardwareId + } + } + + stringData.contains("SNE") -> { + val slData = stringData.split(" ") + if (slData.size > 1) { + val hardwareId = slData[0].trim() + deviceHardwareId += hardwareId with(sharedPreferences.edit()) { - putString(Constants.DEVICE_ID, hardwareId) + putString(Constants.DEVICE_ID, deviceHardwareId) apply() } } diff --git a/app/src/main/res/xml/device_filter.xml b/app/src/main/res/xml/device_filter.xml index b07e602..93713c1 100644 --- a/app/src/main/res/xml/device_filter.xml +++ b/app/src/main/res/xml/device_filter.xml @@ -9,7 +9,7 @@ - +