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

refactor code

Browse Source
This commit is contained in:
prisar
2023-07-21 11:12:50 +05:30
parent 51b49a010c
commit ff5cc154e6
5 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
View File

@@ -73,12 +73,18 @@ class KitScanActivity : AppCompatActivity() {
}
private fun moveToNext() {
if (DataHolder.deviceType.equals(Constants.DEVICE_TYPE_HOMOCUBE)) {
val i = Intent(applicationContext, HemocubeActivity::class.java)
startActivity(i)
} else {
val i = Intent(applicationContext, TestRightActivity::class.java)
startActivity(i)
DataHolder.deviceType.observe(this) { deviceType ->
when (deviceType) {
Constants.DEVICE_TYPE_HOMOCUBE -> {
val i = Intent(applicationContext, HemocubeActivity::class.java)
startActivity(i)
}
"Test" -> {
val i = Intent(applicationContext, TestRightActivity::class.java)
startActivity(i)
}
}
}
}

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

@@ -1,5 +1,6 @@
package com.example.hpostesting.presentation.hemocube
import android.content.Intent
import android.os.Bundle
import android.util.Log
import androidx.fragment.app.Fragment
@@ -33,43 +34,32 @@ class HemoCubeFragment : Fragment() {
private val TAG = "TestRightExpReference"
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
arguments?.let {
// param1 = it.getString(ARG_PARAM1)
// param2 = it.getString(ARG_PARAM2)
}
}
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
): View {
// Inflate the layout for this fragment
binding = FragmentHemoCubeReferenceBinding.inflate(inflater, container, false)
return binding.root
Log.e("mariya", "onViewCreated 1")
if (DataHolder.deviceType.equals(Constants.DEVICE_TYPE_HOMOCUBE) ) {
Log.e("mariya", "onViewCreated if")
binding.btnShowResult.setOnClickListener {
fetchHemoCubeResult()
}
return binding.root
}
private fun fetchHemoCubeResult() {
Log.d("mariya", "fetchHemoCubeResult() called")
viewModel.progressBar.postValue(true)
val fullReadOutput = StringBuilder()
(activity as TestRightActivity).mService.eventDrivenWriteHemoCube(
(activity as HemocubeActivity).mService.eventDrivenWriteHemoCube(
object : UsbServiceListener {
override fun onUsbRead(data: ByteArray?) {
Log.d("mariya", data.toString())
data?.let {
val stringData = String(it)
fullReadOutput.append(stringData)
Log.d(TAG, "fullReadOutput = $fullReadOutput")
binding.tvSubtitle4.text = fullReadOutput
if (stringData.contains("OK", true)) {

6
app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt
View File

@@ -118,8 +118,8 @@ class HemocubeActivity : AppCompatActivity() {
} else {
mDriver = availableDrivers[0]
viewModel.testDetails?.deviceId = mDriver.device.serialNumber.toString()
DataHolder.deviceSerialNumber = mDriver.device.serialNumber.toString()
// viewModel.testDetails?.deviceId = mDriver.device.serialNumber.toString()
// DataHolder.deviceSerialNumber = mDriver.device.serialNumber.toString()
mConnection = manager.openDevice(mDriver.device)
if (mConnection == null) {
@@ -167,7 +167,7 @@ class HemocubeActivity : AppCompatActivity() {
return
supportFragmentManager.beginTransaction()
.replace(binding.flMain.id, HemoCubeFragment()).commit()
.replace(binding.fghemocube.id, HemoCubeFragment()).commit()
}
fun onErrorReported(msg: String) {

5
app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt
View File

@@ -29,7 +29,6 @@ class UsbService : Service() {
}
override fun onBind(intent: Intent): IBinder {
Log.d("surya", "onBind() called")
return binder
}
@@ -38,8 +37,8 @@ class UsbService : Service() {
// Todo: Uncomment this
mPort = driver.ports[0] // Most devices have just one port (port 0)
mPort.open(connection)
// mPort.setParameters(115200, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
mPort.setParameters(9600, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
mPort.setParameters(115200, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
// mPort.setParameters(9600, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
//
isUsbConnected = true
Log.d(TAG, "My Usb Connected ${mPort.driver}")

2
app/src/main/res/layout/activity_hemocube.xml
View File

@@ -24,7 +24,7 @@
app:layout_constraintTop_toTopOf="parent"/>
<FrameLayout
android:id="@+id/fl_main"
android:id="@+id/fghemocube"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintStart_toStartOf="parent"