From 80fa523ec9d365b90091c14df0a49bccaa0ca2e2 Mon Sep 17 00:00:00 2001 From: Mariya Date: Tue, 5 Dec 2023 17:57:32 +0530 Subject: [PATCH 1/5] String Issues fixed --- .../hpostesting/presentation/dashboard/DashboardActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt index fe96862..53b847f 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt @@ -10,7 +10,6 @@ import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.navigateUp import androidx.navigation.ui.setupActionBarWithNavController import androidx.navigation.ui.setupWithNavController -import com.example.hpostesting.presentation.dashboard.SlideshowSettingsFragment import com.google.android.material.navigation.NavigationView import com.google.firebase.appdistribution.FirebaseAppDistribution import com.google.firebase.appdistribution.FirebaseAppDistributionException From 3c8570c46bf31f831ea615119775da5aa69fa98e Mon Sep 17 00:00:00 2001 From: Mariya Date: Wed, 13 Dec 2023 18:56:40 +0530 Subject: [PATCH 2/5] gradle version changed --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 8db906e..8a60995 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ android { applicationId "in.sminnovations.hpostesting" minSdk 21 targetSdk 34 - versionCode 44 + versionCode 45 versionName "2.1.45" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From d6b3df25f8471edb7a04e82e4c922cd9c2c7ad0e Mon Sep 17 00:00:00 2001 From: Mariya Date: Wed, 13 Dec 2023 20:53:34 +0530 Subject: [PATCH 3/5] gradle version changed --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8a60995..14c2ab2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { applicationId "in.sminnovations.hpostesting" minSdk 21 targetSdk 34 - versionCode 45 - versionName "2.1.45" + versionCode 48 + versionName "2.1.48" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } From e7600dafec59971ae02acba771c3d53bfaf87a22 Mon Sep 17 00:00:00 2001 From: Mariya Date: Thu, 14 Dec 2023 12:43:10 +0530 Subject: [PATCH 4/5] gradle version changed --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 14c2ab2..76b4cb5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { applicationId "in.sminnovations.hpostesting" minSdk 21 targetSdk 34 - versionCode 48 - versionName "2.1.48" + versionCode 51 + versionName "2.1.51" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } From 11d4c99e02fc55a9f54801ad4ef01b2d0109a1aa Mon Sep 17 00:00:00 2001 From: Kaif Date: Thu, 14 Dec 2023 16:56:39 +0530 Subject: [PATCH 5/5] 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 @@ - +