From 41798aa37bf65ea4ae66f73f762c781d3f5f86c9 Mon Sep 17 00:00:00 2001 From: Mariya Date: Thu, 14 Dec 2023 13:07:15 +0530 Subject: [PATCH 1/2] Digital Card button removed --- .../hpostesting/presentation/hemocube/HemoCubeFragment.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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..fbba3a6 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 @@ -130,13 +130,11 @@ class HemoCubeFragment : Fragment() { activity?.runOnUiThread { binding.btnSubmit.visibility = View.GONE - binding.btnDigitalCard.visibility = View.VISIBLE - binding.btnDigitalCard.setOnClickListener { val i = Intent( - requireContext().applicationContext, DigitalCardActivity::class.java + requireContext().applicationContext, DashboardActivity::class.java ) startActivity(i) - } + } } if (result == "Local") { From 7fe8202968340b9de1b88a17f8a00dd9c06ea830 Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Fri, 15 Dec 2023 10:22:50 +0530 Subject: [PATCH 2/2] add config error msg and v2 usb config --- .../java/com/example/hpostesting/data/constant/Constants.kt | 2 ++ .../hpostesting/presentation/hemocube/HemoCubeFragment.kt | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) 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..b8d8eac 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 @@ -29,6 +29,8 @@ object Constants { const val DEVICE_VENDOR_ID = 1027 const val HOMO_CUBE_ID = 29987 const val VENDOR_ID = 6790 + const val HEMO_CUBE_V2_ID = 24577 + const val HEMO_CUBE_V2_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 fbba3a6..6eba8bb 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,15 @@ class HemoCubeFragment : Fragment() { when { stringData.contains("SN") -> { val slData = stringData.split(" ") - if (slData.size > 1) { + if (slData.size > 1 && slData[1].trim().length == 12) { val hardwareId = slData[1].trim() deviceHardwareId = hardwareId with(sharedPreferences.edit()) { putString(Constants.DEVICE_ID, hardwareId) apply() } + } else { + hemoCubeViewModel.messages.postValue("Config error") } activity?.runOnUiThread { binding.btnPlacebuffer.visibility = View.VISIBLE