smiuser/hpos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'v2-hardware-config' into preprod

Browse Source
This commit is contained in:
Pritimay Sarkar
2023-12-15 10:32:56 +05:30
parent 590abb5c73 7fe8202968
commit 4f7aa74314
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
View File

@@ -27,8 +27,10 @@ object Constants {
const val DEVICE_TYPE_TEST_RIGHT = "TEST_RIGHT" const val DEVICE_TYPE_TEST_RIGHT = "TEST_RIGHT"
const val DEVICE_VENDOR_ID = 1027 const val DEVICE_VENDOR_ID = 1027
const val HOMO_CUBE_ID = 24577 const val HOMO_CUBE_ID = 29987
const val VENDOR_ID = 1027 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_NORMAL = 400
const val ERROR_CRITICAL = 401 const val ERROR_CRITICAL = 401

10
app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
View File

@@ -130,13 +130,11 @@ class HemoCubeFragment : Fragment() {
activity?.runOnUiThread { activity?.runOnUiThread {
binding.btnSubmit.visibility = View.GONE binding.btnSubmit.visibility = View.GONE
binding.btnDigitalCard.visibility = View.VISIBLE
binding.btnDigitalCard.setOnClickListener {
val i = Intent( val i = Intent(
requireContext().applicationContext, DigitalCardActivity::class.java requireContext().applicationContext, DashboardActivity::class.java
) )
startActivity(i) startActivity(i)
}
} }
} }
if (result == "Local") { if (result == "Local") {
@@ -296,7 +294,7 @@ class HemoCubeFragment : Fragment() {
when { when {
stringData.contains("SNS") -> { stringData.contains("SNS") -> {
val slData = stringData.split(" ") val slData = stringData.split(" ")
if (slData.size > 1) { if (slData.size > 1 && slData[1].trim().length == 12) {
val hardwareId = slData[1].trim() val hardwareId = slData[1].trim()
deviceHardwareId = hardwareId deviceHardwareId = hardwareId
} }
@@ -311,6 +309,8 @@ class HemoCubeFragment : Fragment() {
putString(Constants.DEVICE_ID, deviceHardwareId) putString(Constants.DEVICE_ID, deviceHardwareId)
apply() apply()
} }
} else {
hemoCubeViewModel.messages.postValue("Config error")
} }
activity?.runOnUiThread { activity?.runOnUiThread {
binding.btnPlacebuffer.visibility = View.VISIBLE binding.btnPlacebuffer.visibility = View.VISIBLE