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 6d0d083..b32e98f 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 @@ -1636,4 +1636,13 @@ object Constants { listOf(24500, 26250), ) ) + + + val COEFFICIENTS: Map>> = mapOf( + "HC-V1-005" to listOf( + listOf(1.5,0.0), + listOf(0.0,0.0) + ) + ) + } \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/repository/LocalFileRepository.kt b/app/src/main/java/com/example/hpostesting/data/repository/LocalFileRepository.kt index 2a8553f..0928091 100644 --- a/app/src/main/java/com/example/hpostesting/data/repository/LocalFileRepository.kt +++ b/app/src/main/java/com/example/hpostesting/data/repository/LocalFileRepository.kt @@ -14,7 +14,4 @@ class LocalFileRepository(private val localFileDataSource: LocalFileDataSource) fun saveTextToDisk(filepath: String, contents: String) = localFileDataSource.saveTextToDisk(filepath, contents) - - - } \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt b/app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt index 4031909..0c32c61 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt @@ -1,7 +1,7 @@ package com.example.hpostesting.presentation.adapter -import android.content.Context import android.annotation.SuppressLint +import android.content.Context import android.content.res.Resources import android.view.LayoutInflater import android.view.View @@ -28,7 +28,8 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int) RecyclerView.Adapter() { inner class OfflineUserListViewHolder(val binding: OfflineUserListViewBinding) : - RecyclerView.ViewHolder(binding.root) + RecyclerView.ViewHolder(binding.root) { + } private val differCallback = object : DiffUtil.ItemCallback() { override fun areItemsTheSame( @@ -56,12 +57,27 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int) return differ.currentList.size } + @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: OfflineUserListViewHolder, position: Int) { val userList = differ.currentList[position] holder.binding.apply { userID.text = "User ID: ${userList._id}" bloodGroup.text = "Blood group: ${userList.bloodGroup}" - time.text = "Time: ${userList.incubationTime}" + time.text = "Time: ${isBetween15And30Minutes(userList.incubationTime)} \n Started at: ${ + SimpleDateFormat("HH:mm:ss").format( + SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss", Locale.getDefault() + ).parse(userList.incubationTime)!! + ) + }" + + if (userList.testStatus!!) { + teststatus.text = view.context.getString(R.string.test_concluded) + + } else { + teststatus.text = view.context.getString(R.string.test_pending) + } + userCard.setOnClickListener { if (false) { Toast.makeText( @@ -112,6 +128,7 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int) } } } + } } @@ -125,4 +142,21 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int) return diffMillis / (60 * 1000) } + + + private fun showWarningToast(resId: Int) { + val contextToUse = view.context ?: return + + val message = try { + contextToUse.getString(resId) + } catch (e: Resources.NotFoundException) { + "Resource not found for ID: $resId" + } + + Toast.makeText( + contextToUse, + message, + Toast.LENGTH_SHORT + ).show() + } } \ No newline at end of file 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 da09053..e14ee93 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 @@ -415,7 +415,7 @@ class HemoCubeFragment : Fragment() { getString(R.string.power_bank) ) } - + currentResultData.contains("#SS2") && this.testStatusCode < TestStatus.FIRST_GAIN_STARTED.code -> { this.testStatusCode = TestStatus.FIRST_GAIN_STARTED.code hemoCubeViewModel.messages.postValue("1.3X Gain Started") diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt index a5918b8..3a478c7 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt @@ -204,6 +204,8 @@ class HemoCubeViewModel @Inject constructor( bufferCheckData.localFlag = true hemoCubeBufferDao.insertAll(bufferCheckData) } + + else -> {} } } catch (e: Exception) { Log.e("Testdb", "Exception during data upload: ${e.message}") diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt index 6f5e98e..5d3aab2 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt @@ -34,7 +34,7 @@ class UsbService : Service() { fun connect(driver: UsbSerialDriver, connection: UsbDeviceConnection) { mPort = driver.ports[0] // Most devices have just one port (port 0) mPort.open(connection) - mPort.setParameters(9600, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE) + mPort.setParameters(115200, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE) isUsbConnected = true Log.d(TAG, "My Usb Connected ${mPort.driver}") diff --git a/app/src/main/res/layout/fragment_hemo_cube_reference.xml b/app/src/main/res/layout/fragment_hemo_cube_reference.xml index 7d23b5f..ca5c4b7 100644 --- a/app/src/main/res/layout/fragment_hemo_cube_reference.xml +++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml @@ -31,17 +31,17 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_title" /> - - - - - - - - - - - + + + + + + + + + + + - +