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 e8acaeb..b1aab07 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,10 @@ object Constants { const val DEVICE_TYPE_TEST_RIGHT = "TEST_RIGHT" const val DEVICE_VENDOR_ID = 1027 - const val HOMO_CUBE_ID = 24577 - const val 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 cf5b65a..ba6f55b 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") { @@ -296,7 +294,7 @@ class HemoCubeFragment : Fragment() { when { stringData.contains("SNS") -> { val slData = stringData.split(" ") - if (slData.size > 1) { + if (slData.size > 1 && slData[1].trim().length == 12) { val hardwareId = slData[1].trim() deviceHardwareId = hardwareId } @@ -311,6 +309,8 @@ class HemoCubeFragment : Fragment() { putString(Constants.DEVICE_ID, deviceHardwareId) apply() } + } else { + hemoCubeViewModel.messages.postValue("Config error") } activity?.runOnUiThread { binding.btnPlacebuffer.visibility = View.VISIBLE