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

Merge remote-tracking branch 'origin/Homocube' into Homocube

Browse Source 
# Conflicts:
#	app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt
This commit is contained in:
smileomi18@gmail.com
2023-07-20 15:44:43 +05:30
parent a34d101fbf fd8fbb863f
commit a8e7d7d60b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt
View File

@@ -76,7 +76,8 @@ class TestRightExpReference : Fragment() {
} }
override fun onClickPositiveButton() { override fun onClickPositiveButton() {
startTakingReference() // startTakingReference()
fetchHemoCubeResult()
} }
}) })
} }
@@ -125,14 +126,14 @@ class TestRightExpReference : Fragment() {
viewModel.progressBar.postValue(true) viewModel.progressBar.postValue(true)
val fullReadOutput = StringBuilder() val fullReadOutput = StringBuilder()
(activity as TestRightActivity).mService.eventDrivenWrite(TestRightCommands.read, (activity as TestRightActivity).mService.eventDrivenWrite2(
object : UsbServiceListener { object : UsbServiceListener {
override fun onUsbRead(data: ByteArray?) { override fun onUsbRead(data: ByteArray?) {
Log.d("mariya", data.toString()) Log.d("mariya", data.toString())
data?.let { data?.let {
val stringData = String(it) val stringData = String(it)
fullReadOutput.append(stringData) fullReadOutput.append(stringData)
Log.d(TAG, "fullReadOutput = $fullReadOutput") Log.d("mariya", "fullReadOutput = $fullReadOutput")
if (stringData.contains("OK", true)) { if (stringData.contains("OK", true)) {
Log.d( Log.d(