Compare commits
28 Commits
API-CALLS-
...
2.1.119
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
95b3a072b4 | ||
|
|
be21430d0a | ||
|
|
3609d728c1 | ||
|
|
7302ad669f | ||
|
|
ef98b09eaf | ||
|
|
f631a273d7 | ||
|
|
de74da3135 | ||
|
|
37c8dde5bd | ||
|
|
5f460f6aa3 | ||
|
|
ad625992a7 | ||
|
|
db518007b3 | ||
|
|
4d09bad516 | ||
|
|
aad33e3907 | ||
|
|
52279c4419 | ||
|
|
190a72e407 | ||
|
|
466d0e2afc | ||
|
|
4aa6fb020b | ||
|
|
044a545979 | ||
|
|
45fd4861f4 | ||
|
|
1f9f8060cb | ||
|
|
1a3bb67dce | ||
|
|
4fef75b937 | ||
|
|
3dd247b15d | ||
|
|
42b33c9397 | ||
|
|
c5980a9cfe | ||
|
|
3e0523e163 | ||
|
|
173d4a2767 | ||
|
|
c166bab804 |
@@ -14,13 +14,13 @@ android {
|
|||||||
compileSdk 34
|
compileSdk 34
|
||||||
namespace 'in.sminnovations.hpostesting'
|
namespace 'in.sminnovations.hpostesting'
|
||||||
|
|
||||||
// prod - production, preprod - preproduction, quality - qc, dev - development
|
// dev - development, quality - qc, uat - User Acceptance Test, preprod - preproduction, prod - production
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "in.sminnovations.hpostesting.quality"
|
applicationId "in.sminnovations.hpostesting.quality"
|
||||||
minSdk 21
|
minSdk 21
|
||||||
targetSdk 34
|
targetSdk 34
|
||||||
versionCode 100
|
versionCode 106
|
||||||
versionName "2.1.100"
|
versionName "2.1.106"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
@@ -112,6 +112,8 @@ dependencies {
|
|||||||
androidTestImplementation 'org.mockito:mockito-android:3.12.4'
|
androidTestImplementation 'org.mockito:mockito-android:3.12.4'
|
||||||
androidTestImplementation 'org.mockito:mockito-inline:3.12.4'
|
androidTestImplementation 'org.mockito:mockito-inline:3.12.4'
|
||||||
androidTestImplementation 'org.mockito:mockito-android:3.12.4'
|
androidTestImplementation 'org.mockito:mockito-android:3.12.4'
|
||||||
|
testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
|
||||||
|
testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
|
||||||
|
|
||||||
testImplementation "androidx.arch.core:core-testing:2.2.0"
|
testImplementation "androidx.arch.core:core-testing:2.2.0"
|
||||||
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
|
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
|
||||||
@@ -155,7 +157,7 @@ dependencies {
|
|||||||
implementation("com.squareup.okhttp3:okhttp:4.9.3")
|
implementation("com.squareup.okhttp3:okhttp:4.9.3")
|
||||||
|
|
||||||
implementation "androidx.preference:preference-ktx:1.2.1"
|
implementation "androidx.preference:preference-ktx:1.2.1"
|
||||||
implementation 'io.nats:jnats:2.11.2'
|
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
|
||||||
|
|
||||||
implementation("androidx.work:work-runtime-ktx:2.9.0")
|
implementation("androidx.work:work-runtime-ktx:2.9.0")
|
||||||
|
|
||||||
@@ -163,4 +165,6 @@ dependencies {
|
|||||||
implementation 'com.google.android.play:core:1.10.3'
|
implementation 'com.google.android.play:core:1.10.3'
|
||||||
|
|
||||||
implementation fileTree(dir: 'libs', include: ['*.aar'])
|
implementation fileTree(dir: 'libs', include: ['*.aar'])
|
||||||
|
implementation 'io.nats:jnats:2.11.4'
|
||||||
|
|
||||||
}
|
}
|
||||||
Binary file not shown.
@@ -4,15 +4,15 @@
|
|||||||
"type": "APK",
|
"type": "APK",
|
||||||
"kind": "Directory"
|
"kind": "Directory"
|
||||||
},
|
},
|
||||||
"applicationId": "com.example.hpos",
|
"applicationId": "in.sminnovations.hpostesting.quality",
|
||||||
"variantName": "release",
|
"variantName": "release",
|
||||||
"elements": [
|
"elements": [
|
||||||
{
|
{
|
||||||
"type": "SINGLE",
|
"type": "SINGLE",
|
||||||
"filters": [],
|
"filters": [],
|
||||||
"attributes": [],
|
"attributes": [],
|
||||||
"versionCode": 1,
|
"versionCode": 101,
|
||||||
"versionName": "1.0",
|
"versionName": "2.1.101",
|
||||||
"outputFile": "app-release.apk"
|
"outputFile": "app-release.apk"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -95,6 +95,7 @@
|
|||||||
android:exported="false"
|
android:exported="false"
|
||||||
android:label="@string/title_activity_dashboard"
|
android:label="@string/title_activity_dashboard"
|
||||||
android:theme="@style/Theme.HPOS.NoActionBar"
|
android:theme="@style/Theme.HPOS.NoActionBar"
|
||||||
|
android:screenOrientation="portrait"
|
||||||
tools:ignore="AppLinkUrlError,MissingClass">
|
tools:ignore="AppLinkUrlError,MissingClass">
|
||||||
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
@@ -119,8 +120,12 @@
|
|||||||
android:theme="@style/AppTheme.NoActionBar">
|
android:theme="@style/AppTheme.NoActionBar">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
<category android:name="android.intent.category.HOME" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<category android:name="android.intent.category.MONKEY"/>
|
||||||
|
<category android:name="android.intent.category.LAUNCHER_APP" />
|
||||||
|
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
@@ -160,7 +165,7 @@
|
|||||||
|
|
||||||
<provider
|
<provider
|
||||||
android:name="androidx.core.content.FileProvider"
|
android:name="androidx.core.content.FileProvider"
|
||||||
android:authorities="com.example.hpostesting.fileprovider"
|
android:authorities="${applicationId}.fileprovider"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
android:grantUriPermissions="true">
|
android:grantUriPermissions="true">
|
||||||
<meta-data
|
<meta-data
|
||||||
|
|||||||
@@ -7,8 +7,11 @@ import com.example.hpostesting.data.model.updates.CheckUpdateRequest
|
|||||||
import com.example.hpostesting.data.model.updates.CheckUpdateResponse
|
import com.example.hpostesting.data.model.updates.CheckUpdateResponse
|
||||||
import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
|
import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
|
||||||
import okhttp3.MultipartBody
|
import okhttp3.MultipartBody
|
||||||
|
import okhttp3.Response
|
||||||
import okhttp3.ResponseBody
|
import okhttp3.ResponseBody
|
||||||
import retrofit2.http.Body
|
import retrofit2.http.Body
|
||||||
|
import retrofit2.http.GET
|
||||||
|
import retrofit2.http.Header
|
||||||
import retrofit2.http.Multipart
|
import retrofit2.http.Multipart
|
||||||
import retrofit2.http.POST
|
import retrofit2.http.POST
|
||||||
import retrofit2.http.PUT
|
import retrofit2.http.PUT
|
||||||
@@ -31,6 +34,10 @@ interface MolbioResultApi {
|
|||||||
@Body deviceUpdateRequest: DeviceUpdateRequest
|
@Body deviceUpdateRequest: DeviceUpdateRequest
|
||||||
): ResponseBody
|
): ResponseBody
|
||||||
|
|
||||||
|
@GET("deviceService/device/getClientCertificate")
|
||||||
|
suspend fun downloadClientCertificate(
|
||||||
|
): ResponseBody
|
||||||
|
|
||||||
@Multipart
|
@Multipart
|
||||||
@POST("deviceService/device/uploadLogs")
|
@POST("deviceService/device/uploadLogs")
|
||||||
suspend fun uploadLogs(
|
suspend fun uploadLogs(
|
||||||
|
|||||||
@@ -2,13 +2,13 @@ package com.example.hpostesting.data.constant
|
|||||||
|
|
||||||
object Constants {
|
object Constants {
|
||||||
const val ACTION_USB_PERMISSION = "shanmukha.in.sickle_cell.USB_PERMISSION"
|
const val ACTION_USB_PERMISSION = "shanmukha.in.sickle_cell.USB_PERMISSION"
|
||||||
const val HOMOCUBE_USB_PERMISSION = "shanmukha.in.sickle_cell_homocube.USB_PERMISSION"
|
const val HEMOCUBE_USB_PERMISSION = "shanmukha.in.sickle_cell_homocube.USB_PERMISSION"
|
||||||
|
|
||||||
const val BASE_URL = "www.google.com"
|
const val BASE_URL = "www.google.com"
|
||||||
|
|
||||||
const val ABHA_APP_PACKAGE = "in.ndhm.phr"
|
const val ABHA_APP_PACKAGE = "in.ndhm.phr"
|
||||||
|
|
||||||
const val MOLBIO_INTERGATION = false
|
const val MOLBIO_INTEGRATION = false
|
||||||
const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
|
const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
|
||||||
const val deviceProvisionPassword = "f2ab0e7f9d69"
|
const val deviceProvisionPassword = "f2ab0e7f9d69"
|
||||||
const val DEVICE_ID_API = "deviceIDAPI"
|
const val DEVICE_ID_API = "deviceIDAPI"
|
||||||
|
|||||||
@@ -5,5 +5,8 @@ data class DiagnosticsData (
|
|||||||
var appVersion: String? = "",
|
var appVersion: String? = "",
|
||||||
var deviceType: String = "HEMOCUBE",
|
var deviceType: String = "HEMOCUBE",
|
||||||
var deviceData: String = "",
|
var deviceData: String = "",
|
||||||
|
var devicePassword: String = "",
|
||||||
|
var deviceNatsToken: String = "",
|
||||||
|
var accessToken: String = "",
|
||||||
var runTime: String = ""
|
var runTime: String = ""
|
||||||
)
|
)
|
||||||
@@ -77,6 +77,9 @@ class DatabaseRepository @Inject constructor(
|
|||||||
return safeApiCall { molbioResultApi.deviceUpdate(deviceUpdateRequest) }
|
return safeApiCall { molbioResultApi.deviceUpdate(deviceUpdateRequest) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override suspend fun downloadClientCertificate(): Result<ResponseBody> {
|
||||||
|
return safeApiCall { molbioResultApi.downloadClientCertificate() }
|
||||||
|
}
|
||||||
override suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse> {
|
override suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse> {
|
||||||
return safeApiCall { molbioResultApi.uploadLogs(logFile) }
|
return safeApiCall { molbioResultApi.uploadLogs(logFile) }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,5 +45,6 @@ interface Repository {
|
|||||||
|
|
||||||
suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody>
|
suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody>
|
||||||
|
|
||||||
|
suspend fun downloadClientCertificate(): Result<ResponseBody>
|
||||||
suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse>
|
suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse>
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
package com.example.hpostesting.domain
|
package com.example.hpostesting.domain
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.util.Log
|
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.FileOutputStream
|
import java.io.FileOutputStream
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
@@ -32,7 +31,7 @@ class LogFileManagerImpl @Inject constructor(private val context: Context) : Log
|
|||||||
|
|
||||||
file
|
file
|
||||||
} catch (e: IOException) {
|
} catch (e: IOException) {
|
||||||
Log.e("LogFileManager", "Error creating log file: ${e.message}")
|
// Log.e("LogFileManager", "Error creating log file: ${e.message}")
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -208,74 +208,54 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Setting up the SDK handler
|
|
||||||
|
|
||||||
//Setting up the SDK handler
|
//Setting up the SDK handler
|
||||||
sdkHandler = SDKHandler(this)
|
sdkHandler = SDKHandler(this)
|
||||||
|
|
||||||
//Registers a particular object which conforms to IDcsSdkApiDelegate interface as a receiver of SDK notifications.
|
|
||||||
|
|
||||||
//Registers a particular object which conforms to IDcsSdkApiDelegate interface as a receiver of SDK notifications.
|
//Registers a particular object which conforms to IDcsSdkApiDelegate interface as a receiver of SDK notifications.
|
||||||
sdkHandler!!.dcssdkSetDelegate(this)
|
sdkHandler!!.dcssdkSetDelegate(this)
|
||||||
|
|
||||||
//this command is telling the sdk that we're going to be connecting to the scanner via USB
|
|
||||||
|
|
||||||
//this command is telling the sdk that we're going to be connecting to the scanner via USB
|
//this command is telling the sdk that we're going to be connecting to the scanner via USB
|
||||||
sdkHandler!!.dcssdkSetOperationalMode(DCSSDKDefs.DCSSDK_MODE.DCSSDK_OPMODE_SNAPI)
|
sdkHandler!!.dcssdkSetOperationalMode(DCSSDKDefs.DCSSDK_MODE.DCSSDK_OPMODE_SNAPI)
|
||||||
|
|
||||||
|
|
||||||
//deciding what kind of notifications we want to receive. Explained more in the function
|
|
||||||
//first we use bitmapping to set these values into the notifications_mask.
|
|
||||||
|
|
||||||
|
|
||||||
//deciding what kind of notifications we want to receive. Explained more in the function
|
//deciding what kind of notifications we want to receive. Explained more in the function
|
||||||
//first we use bitmapping to set these values into the notifications_mask.
|
//first we use bitmapping to set these values into the notifications_mask.
|
||||||
var notifications_mask = 0
|
var notifications_mask = 0
|
||||||
// We would like to subscribe to all barcode events
|
// We would like to subscribe to all barcode events
|
||||||
// We would like to subscribe to all barcode events
|
|
||||||
notifications_mask =
|
notifications_mask =
|
||||||
notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
|
notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
|
||||||
// subscribe to events set in notification mask
|
|
||||||
// subscribe to events set in notification mask
|
|
||||||
sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
|
sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
|
||||||
|
|
||||||
|
|
||||||
//so adding all the scanners to the mScannerInfoList, then connecting to the first scanner.
|
|
||||||
//There's only one scanner so this step is unnecessary, I did it thinking about possible scalability.
|
|
||||||
//here I just get the list of available scanners which also returns the USB scanner attached to the tinker board.
|
|
||||||
|
|
||||||
|
|
||||||
//so adding all the scanners to the mScannerInfoList, then connecting to the first scanner.
|
|
||||||
//There's only one scanner so this step is unnecessary, I did it thinking about possible scalability.
|
|
||||||
//here I just get the list of available scanners which also returns the USB scanner attached to the tinker board.
|
|
||||||
mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList())
|
mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList())
|
||||||
|
Log.e("scannersize",sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
|
||||||
//I'm doing mScannerInfoList.get(0) because there's only one scanner which will be at position 0.
|
|
||||||
|
|
||||||
//I'm doing mScannerInfoList.get(0) because there's only one scanner which will be at position 0.
|
|
||||||
if (mScannerInfoList.isNotEmpty()) {
|
if (mScannerInfoList.isNotEmpty()) {
|
||||||
sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
|
sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
|
||||||
} else {
|
} else {
|
||||||
Toast.makeText(this, "No scanner is Available", Toast.LENGTH_LONG).show()
|
Toast.makeText(this,"Error", Toast.LENGTH_LONG).show()
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun pullTrigger() {
|
||||||
|
// Check if the list is not empty before accessing its elements
|
||||||
|
if (mScannerInfoList.isNotEmpty()) {
|
||||||
|
// Only proceed if the scanner is not active
|
||||||
|
if (!mScannerInfoList[0].isActive) {
|
||||||
|
sdkHandler?.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
|
||||||
|
}
|
||||||
|
val inXML = "<inArgs><scannerID> 1 </scannerID></inArgs>"
|
||||||
|
val outXML = StringBuilder()
|
||||||
|
val result: DCSSDK_RESULT =
|
||||||
|
sdkHandler!!.dcssdkExecuteCommandOpCodeInXMLForScanner(
|
||||||
|
DCSSDK_COMMAND_OPCODE.DCSSDK_DEVICE_PULL_TRIGGER, inXML, outXML, mScannerInfoList[0].scannerID // Ensure you're using the correct scanner ID
|
||||||
|
)
|
||||||
|
if (result == DCSSDK_RESULT.DCSSDK_RESULT_SUCCESS) {
|
||||||
|
Log.d("Scanning", "Success")
|
||||||
|
} else if (result == DCSSDK_RESULT.DCSSDK_RESULT_FAILURE) {
|
||||||
|
Log.d("Scanning", "Failed")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Handle the case where the list is empty, perhaps notify the user or log an error
|
||||||
|
Log.e("ScannerError", "No scanners are connected or available.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun pullTrigger() {
|
|
||||||
if (!mScannerInfoList[0].isActive) {
|
|
||||||
sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
|
|
||||||
}
|
|
||||||
val inXML = "<inArgs><scannerID> 1 </scannerID></inArgs>"
|
|
||||||
val outXML = StringBuilder()
|
|
||||||
val result: DCSSDK_RESULT =
|
|
||||||
sdkHandler!!.dcssdkExecuteCommandOpCodeInXMLForScanner(
|
|
||||||
DCSSDK_COMMAND_OPCODE.DCSSDK_DEVICE_PULL_TRIGGER, inXML, outXML, 1
|
|
||||||
)
|
|
||||||
if (result == DCSSDK_RESULT.DCSSDK_RESULT_SUCCESS) Log.d(
|
|
||||||
"Scanning",
|
|
||||||
"Success"
|
|
||||||
) else if (result == DCSSDK_RESULT.DCSSDK_RESULT_FAILURE) Log.d("Scanning", "Failed")
|
|
||||||
//new MyAsyncTask(1, DCSSDKDefs.DCSSDK_COMMAND_OPCODE.DCSSDK_DEVICE_PULL_TRIGGER,null).execute(inXML);
|
|
||||||
}
|
|
||||||
|
|
||||||
//this function is called if barcode is detected.
|
//this function is called if barcode is detected.
|
||||||
override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) {
|
override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) {
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
package com.example.hpostesting.presentation
|
package com.example.hpostesting.presentation
|
||||||
|
|
||||||
|
import android.os.Build
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
|
import androidx.annotation.RequiresApi
|
||||||
|
import com.example.hpostesting.presentation.assurance.AssuranceControlsActivity
|
||||||
import com.example.hpostesting.presentation.dashboard.DashboardActivity
|
import com.example.hpostesting.presentation.dashboard.DashboardActivity
|
||||||
import io.nats.client.AuthHandler
|
import io.nats.client.AuthHandler
|
||||||
import io.nats.client.Connection
|
import io.nats.client.Connection
|
||||||
@@ -8,9 +11,22 @@ import io.nats.client.Message
|
|||||||
import io.nats.client.NKey
|
import io.nats.client.NKey
|
||||||
import io.nats.client.Nats
|
import io.nats.client.Nats
|
||||||
import io.nats.client.Options
|
import io.nats.client.Options
|
||||||
|
import io.nats.client.support.SSLUtils
|
||||||
|
import java.io.BufferedInputStream
|
||||||
|
import java.io.File
|
||||||
|
import java.io.FileInputStream
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.nio.charset.StandardCharsets
|
import java.nio.charset.StandardCharsets
|
||||||
|
import java.nio.file.Paths
|
||||||
import java.security.GeneralSecurityException
|
import java.security.GeneralSecurityException
|
||||||
|
import java.security.KeyStore
|
||||||
|
import java.security.SecureRandom
|
||||||
|
import java.security.cert.CertificateFactory
|
||||||
|
import javax.net.ssl.KeyManager
|
||||||
|
import javax.net.ssl.KeyManagerFactory
|
||||||
|
import javax.net.ssl.SSLContext
|
||||||
|
import javax.net.ssl.TrustManager
|
||||||
|
import javax.net.ssl.TrustManagerFactory
|
||||||
|
|
||||||
|
|
||||||
class NatsManager(datacollector: DashboardActivity) {
|
class NatsManager(datacollector: DashboardActivity) {
|
||||||
@@ -20,16 +36,57 @@ class NatsManager(datacollector: DashboardActivity) {
|
|||||||
val datacollector = datacollector
|
val datacollector = datacollector
|
||||||
var connect = false
|
var connect = false
|
||||||
|
|
||||||
|
private fun createSSLContext(): SSLContext {
|
||||||
|
val keyStorePassword = "prime24".toCharArray() // Change as necessary
|
||||||
|
val clientCertPath = "/storage/sdcard0/Download/client.p12"
|
||||||
|
|
||||||
|
// Load client certificate and key
|
||||||
|
val keyStore = KeyStore.getInstance("PKCS12")
|
||||||
|
FileInputStream(clientCertPath).use { keyStoreInputStream ->
|
||||||
|
keyStore.load(keyStoreInputStream, keyStorePassword)
|
||||||
|
}
|
||||||
|
val caCertPath = "/storage/sdcard0/Android/data/in.sminnovations.hpostesting.quality/files/NATS/clientCertificate/client-cert.pem"
|
||||||
|
val caCert = FileInputStream(caCertPath).use { inputStream ->
|
||||||
|
val certificateFactory = CertificateFactory.getInstance("X.509")
|
||||||
|
certificateFactory.generateCertificate(inputStream)
|
||||||
|
}
|
||||||
|
|
||||||
|
val trustStore = KeyStore.getInstance(KeyStore.getDefaultType()).apply {
|
||||||
|
load(null, null) // Initialize the keystore
|
||||||
|
setCertificateEntry("caCert", caCert) // Add the CA certificate
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize key manager factory
|
||||||
|
val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
|
||||||
|
kmf.init(keyStore, keyStorePassword)
|
||||||
|
|
||||||
|
// Initialize trust manager factory
|
||||||
|
val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
|
||||||
|
tmf.init(trustStore)
|
||||||
|
|
||||||
|
// Initialize SSLContext
|
||||||
|
val sslContext = SSLContext.getInstance("TLS")
|
||||||
|
sslContext.init(kmf.keyManagers, tmf.trustManagers, SecureRandom())
|
||||||
|
|
||||||
|
return sslContext
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@RequiresApi(Build.VERSION_CODES.O)
|
||||||
fun connect() {
|
fun connect() {
|
||||||
Log.d(TAG, "TRY TO CONNECT")
|
Log.d(TAG, "TRY TO CONNECT")
|
||||||
Thread {
|
Thread {
|
||||||
val seedString = "SUAEB5PUWNS6C2HUV3MFI6HUDEAPGPFPBHMI73NHIQATCDD2BWALVEZXZ4"
|
|
||||||
|
val seedString = "SUAJH5VMO6GDRQA6QTXCLIJMS74IWIUTU3NJVYIOTZF2LBWUPD77DA2ZEA"
|
||||||
|
Log.e("seedString",seedString)
|
||||||
val seedBytes = seedString.toCharArray()
|
val seedBytes = seedString.toCharArray()
|
||||||
|
|
||||||
val theNKey = NKey.fromSeed(seedBytes) // really should load from somewhere
|
val theNKey = NKey.fromSeed(seedBytes) // really should load from somewhere
|
||||||
|
|
||||||
val options = Options.Builder()
|
val options = Options.Builder()
|
||||||
.server("nats://192.168.10.117:4222")
|
.server("nats://nanodgx.in:4222")
|
||||||
|
.sslContext(SSLUtils.createOpenTLSContext())
|
||||||
.authHandler(object : AuthHandler {
|
.authHandler(object : AuthHandler {
|
||||||
override fun getID(): CharArray? {
|
override fun getID(): CharArray? {
|
||||||
return try {
|
return try {
|
||||||
@@ -67,6 +124,11 @@ class NatsManager(datacollector: DashboardActivity) {
|
|||||||
connect = true
|
connect = true
|
||||||
datacollector.setConnect(true)
|
datacollector.setConnect(true)
|
||||||
|
|
||||||
|
if (nc?.status == Connection.Status.CONNECTED) {
|
||||||
|
Log.e("NATSCONNECTION", "NATS is successfully connected.")
|
||||||
|
} else {
|
||||||
|
Log.e("NATSCONNECTION", "NATS is not connected. Current status: ${nc?.status}")
|
||||||
|
}
|
||||||
|
|
||||||
nc?.publish(
|
nc?.publish(
|
||||||
"server.hpos.HCV-000-3001.ping",
|
"server.hpos.HCV-000-3001.ping",
|
||||||
@@ -81,9 +143,10 @@ class NatsManager(datacollector: DashboardActivity) {
|
|||||||
println("PRITIMOI SARKAR $msg")
|
println("PRITIMOI SARKAR $msg")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
d?.subscribe("device.hpos.HCV-000-3001.update") { msg ->
|
d?.subscribe("device.hpos.HCV-000-3001.update") { msg ->
|
||||||
val response = String(msg.data, StandardCharsets.UTF_8)
|
val response = String(msg.data, StandardCharsets.UTF_8)
|
||||||
datacollector. setResponse(response)
|
datacollector.setResponse(response)
|
||||||
println("Message received (up to 100 times): $response")
|
println("Message received (up to 100 times): $response")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,7 +177,7 @@ class NatsManager(datacollector: DashboardActivity) {
|
|||||||
} catch (exp: Exception) {
|
} catch (exp: Exception) {
|
||||||
println(exp.printStackTrace())
|
println(exp.printStackTrace())
|
||||||
connect = false
|
connect = false
|
||||||
datacollector.setConnect(true)
|
datacollector.setConnect(false)
|
||||||
}
|
}
|
||||||
}.start()
|
}.start()
|
||||||
|
|
||||||
|
|||||||
@@ -3,14 +3,19 @@ package com.example.hpostesting.presentation.assurance
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
|
import android.util.Log
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
|
import com.example.hpostesting.presentation.NatsManager
|
||||||
|
import com.example.hpostesting.presentation.dashboard.IDataCollector
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
import `in`.sminnovations.hpostesting.databinding.ActivityAssuranceControlsBinding
|
import `in`.sminnovations.hpostesting.databinding.ActivityAssuranceControlsBinding
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
class AssuranceControlsActivity: AppCompatActivity() {
|
class AssuranceControlsActivity: AppCompatActivity(), IDataCollector {
|
||||||
lateinit var binding: ActivityAssuranceControlsBinding
|
lateinit var binding: ActivityAssuranceControlsBinding
|
||||||
lateinit var sharedPreference: SharedPreferences
|
lateinit var sharedPreference: SharedPreferences
|
||||||
|
lateinit var nats: NatsManager
|
||||||
|
var responses: String = ""
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
@@ -24,5 +29,21 @@ class AssuranceControlsActivity: AppCompatActivity() {
|
|||||||
.replace(binding.fgAssuranceControls.id, AssuranceControlsFragment())
|
.replace(binding.fgAssuranceControls.id, AssuranceControlsFragment())
|
||||||
.commit()
|
.commit()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// nats = NatsManager(this)
|
||||||
|
// nats.connect()
|
||||||
|
// nats.pub("server.hpos.HCV-000-3001.ping", "THIS IS A TEST MSG")
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun setConnect(connect: Boolean) {
|
||||||
|
if(connect){
|
||||||
|
Log.i("NATS Connection", connect.toString())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun setResponse(response: String) {
|
||||||
|
|
||||||
|
responses = responses+response+"\n"
|
||||||
|
println(responses)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -12,6 +12,7 @@ import android.view.ViewGroup
|
|||||||
import android.widget.AdapterView
|
import android.widget.AdapterView
|
||||||
import android.widget.ArrayAdapter
|
import android.widget.ArrayAdapter
|
||||||
import android.widget.Spinner
|
import android.widget.Spinner
|
||||||
|
import android.widget.Toast
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import com.example.hpostesting.data.DataHolder
|
import com.example.hpostesting.data.DataHolder
|
||||||
import com.example.hpostesting.data.constant.Constants
|
import com.example.hpostesting.data.constant.Constants
|
||||||
@@ -30,6 +31,9 @@ class AssuranceControlsFragment: Fragment() {
|
|||||||
binding = FragmentAssuranceControlsBinding.inflate(inflater, container, false)
|
binding = FragmentAssuranceControlsBinding.inflate(inflater, container, false)
|
||||||
sharedPreferences =
|
sharedPreferences =
|
||||||
requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
|
requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
|
||||||
|
|
||||||
|
DataHolder.hemoCubeTestData!!.solution = ""
|
||||||
|
DataHolder.hemoCubeTestData!!.volume = ""
|
||||||
return binding.root
|
return binding.root
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -42,7 +46,7 @@ class AssuranceControlsFragment: Fragment() {
|
|||||||
// binding.btnSubmit.visibility = View.GONE
|
// binding.btnSubmit.visibility = View.GONE
|
||||||
|
|
||||||
val solutionSpinner: Spinner = binding.spinnerSolutions
|
val solutionSpinner: Spinner = binding.spinnerSolutions
|
||||||
val solutionOptions = arrayOf("Select solution", "Tartrazine", "AR")
|
val solutionOptions = arrayOf("Select solution", "Tartrazine", "Acid Red")
|
||||||
val solutionAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions)
|
val solutionAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions)
|
||||||
solutionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
|
solutionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
|
||||||
solutionSpinner.adapter = solutionAdapter
|
solutionSpinner.adapter = solutionAdapter
|
||||||
@@ -121,6 +125,13 @@ class AssuranceControlsFragment: Fragment() {
|
|||||||
volumeSpinner.setSelection(volumePosition)
|
volumeSpinner.setSelection(volumePosition)
|
||||||
|
|
||||||
binding.btnSubmit.setOnClickListener {
|
binding.btnSubmit.setOnClickListener {
|
||||||
|
val selectedSolution = DataHolder.hemoCubeTestData!!.solution
|
||||||
|
val selectedVolume = DataHolder.hemoCubeTestData!!.volume
|
||||||
|
if (selectedSolution == "Select solution" || selectedVolume == "Select volume") {
|
||||||
|
Toast.makeText(requireContext(), "Please select both solution and volume", Toast.LENGTH_SHORT).show()
|
||||||
|
return@setOnClickListener
|
||||||
|
}
|
||||||
|
|
||||||
DataHolder.hemoCubeTestData!!.quickCapture = true
|
DataHolder.hemoCubeTestData!!.quickCapture = true
|
||||||
val currentUnixTime = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
val currentUnixTime = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
Instant.now().epochSecond
|
Instant.now().epochSecond
|
||||||
|
|||||||
@@ -145,18 +145,18 @@ class AutoDacActivity: AppCompatActivity() {
|
|||||||
val mPendingIntent: PendingIntent
|
val mPendingIntent: PendingIntent
|
||||||
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
||||||
mPendingIntent = PendingIntent.getBroadcast(
|
mPendingIntent = PendingIntent.getBroadcast(
|
||||||
this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
mPendingIntent = PendingIntent.getBroadcast(
|
mPendingIntent = PendingIntent.getBroadcast(
|
||||||
this,
|
this,
|
||||||
0,
|
0,
|
||||||
Intent(Constants.HOMOCUBE_USB_PERMISSION),
|
Intent(Constants.HEMOCUBE_USB_PERMISSION),
|
||||||
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
|
val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
|
||||||
registerReceiver(broadcastReceiver, filter)
|
registerReceiver(broadcastReceiver, filter)
|
||||||
manager.requestPermission(device, mPendingIntent)
|
manager.requestPermission(device, mPendingIntent)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,11 +12,15 @@ import androidx.fragment.app.activityViewModels
|
|||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import com.example.hpostesting.data.constant.Constants
|
import com.example.hpostesting.data.constant.Constants
|
||||||
import com.example.hpostesting.data.constant.HemoCubeCommands
|
import com.example.hpostesting.data.constant.HemoCubeCommands
|
||||||
|
import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
|
||||||
import com.example.hpostesting.data.model.patient.DeviceData
|
import com.example.hpostesting.data.model.patient.DeviceData
|
||||||
import com.example.hpostesting.presentation.UsbServiceListener
|
import com.example.hpostesting.presentation.UsbServiceListener
|
||||||
import com.google.firebase.crashlytics.ktx.crashlytics
|
import com.google.firebase.crashlytics.ktx.crashlytics
|
||||||
import com.google.firebase.ktx.Firebase
|
import com.google.firebase.ktx.Firebase
|
||||||
import `in`.sminnovations.hpostesting.databinding.FragmentAutoDacBinding
|
import `in`.sminnovations.hpostesting.databinding.FragmentAutoDacBinding
|
||||||
|
import java.text.SimpleDateFormat
|
||||||
|
import java.util.Calendar
|
||||||
|
import java.util.Locale
|
||||||
|
|
||||||
class AutoDacFragment: Fragment() {
|
class AutoDacFragment: Fragment() {
|
||||||
|
|
||||||
@@ -101,8 +105,6 @@ class AutoDacFragment: Fragment() {
|
|||||||
HemoCubeCommands.AUTO_DAC_COMMAND,
|
HemoCubeCommands.AUTO_DAC_COMMAND,
|
||||||
object : UsbServiceListener {
|
object : UsbServiceListener {
|
||||||
override fun onUsbRead(data: ByteArray?) {
|
override fun onUsbRead(data: ByteArray?) {
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
override fun onUsbError(e: Exception?) {
|
override fun onUsbError(e: Exception?) {
|
||||||
autoDacViewModel.progressBar.postValue(false)
|
autoDacViewModel.progressBar.postValue(false)
|
||||||
@@ -141,22 +143,22 @@ class AutoDacFragment: Fragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (resultData.contains("#CC")) {
|
if (resultData.contains("#CC")) {
|
||||||
|
autoDacViewModel.addAutoDacDataToDb(
|
||||||
|
DiagnosticsData(
|
||||||
|
deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
|
||||||
|
devicePassword = sharedPreferences.getString(Constants.DEVICE_PASSWORD_API, "").toString(),
|
||||||
|
deviceNatsToken = sharedPreferences.getString(Constants.NATS_TOKEN, "").toString(),
|
||||||
|
accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString(),
|
||||||
|
deviceData = resultData,
|
||||||
|
runTime = SimpleDateFormat(
|
||||||
|
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
||||||
|
).format(Calendar.getInstance().time)
|
||||||
|
)
|
||||||
|
)
|
||||||
activity?.runOnUiThread {
|
activity?.runOnUiThread {
|
||||||
binding.ivCheck.visibility = View.VISIBLE
|
binding.ivCheck.visibility = View.VISIBLE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (resultData.contains("END") || fullReadOutput.contains("END")) {
|
|
||||||
// autoDacViewModel.addAutoDacDataToDb(
|
|
||||||
// DiagnosticsData(
|
|
||||||
// deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
|
|
||||||
// deviceData = resultData,
|
|
||||||
// runTime = SimpleDateFormat(
|
|
||||||
// "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
|
||||||
// ).format(Calendar.getInstance().time)
|
|
||||||
// )
|
|
||||||
// )
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onUsbError(e: Exception?) {
|
override fun onUsbError(e: Exception?) {
|
||||||
@@ -168,7 +170,6 @@ class AutoDacFragment: Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
fun parseData(inputData: List<String>): List<Pair<String, String>> {
|
fun parseData(inputData: List<String>): List<Pair<String, String>> {
|
||||||
val pattern = Regex("([A-Z]+)\\s(\\d+)")
|
val pattern = Regex("([A-Z]+)\\s(\\d+)")
|
||||||
val parsedData = mutableListOf<Pair<String, String>>()
|
val parsedData = mutableListOf<Pair<String, String>>()
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.example.hpostesting.presentation.buffercheck
|
package com.example.hpostesting.presentation.buffercheck
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
import android.app.PendingIntent
|
import android.app.PendingIntent
|
||||||
import android.content.BroadcastReceiver
|
import android.content.BroadcastReceiver
|
||||||
import android.content.ComponentName
|
import android.content.ComponentName
|
||||||
@@ -124,21 +125,22 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@SuppressLint("MutableImplicitPendingIntent")
|
||||||
private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
|
private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
|
||||||
val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
||||||
PendingIntent.getBroadcast(
|
PendingIntent.getBroadcast(
|
||||||
this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
PendingIntent.getBroadcast(
|
PendingIntent.getBroadcast(
|
||||||
this,
|
this,
|
||||||
0,
|
0,
|
||||||
Intent(Constants.HOMOCUBE_USB_PERMISSION),
|
Intent(Constants.HEMOCUBE_USB_PERMISSION),
|
||||||
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
|
val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
|
||||||
registerReceiver(broadcastReceiver, filter)
|
registerReceiver(broadcastReceiver, filter)
|
||||||
manager.requestPermission(device, mPendingIntent)
|
manager.requestPermission(device, mPendingIntent)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -144,18 +144,18 @@ class CalibrationActivity: AppCompatActivity() {
|
|||||||
private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
|
private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
|
||||||
val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
||||||
PendingIntent.getBroadcast(
|
PendingIntent.getBroadcast(
|
||||||
this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
PendingIntent.getBroadcast(
|
PendingIntent.getBroadcast(
|
||||||
this,
|
this,
|
||||||
0,
|
0,
|
||||||
Intent(Constants.HOMOCUBE_USB_PERMISSION),
|
Intent(Constants.HEMOCUBE_USB_PERMISSION),
|
||||||
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
|
val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
|
||||||
registerReceiver(broadcastReceiver, filter)
|
registerReceiver(broadcastReceiver, filter)
|
||||||
manager.requestPermission(device, mPendingIntent)
|
manager.requestPermission(device, mPendingIntent)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -156,9 +156,10 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
|
|||||||
val file = File(getExternalFilesDir("Updates"), "update.apk")
|
val file = File(getExternalFilesDir("Updates"), "update.apk")
|
||||||
file.setReadable(true, false) // Ensure the file is readable
|
file.setReadable(true, false) // Ensure the file is readable
|
||||||
|
|
||||||
|
val pInfo = baseContext.packageManager.getPackageInfo(baseContext.packageName, 0)
|
||||||
val uri: Uri = FileProvider.getUriForFile(
|
val uri: Uri = FileProvider.getUriForFile(
|
||||||
this,
|
this,
|
||||||
"com.example.hpostesting.fileprovider",
|
"${pInfo}.fileprovider",
|
||||||
file
|
file
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.example.hpostesting.presentation.dashboard
|
package com.example.hpostesting.presentation.dashboard
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
|
import android.content.ComponentName
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
@@ -14,12 +15,13 @@ import com.example.hpostesting.data.constant.Constants
|
|||||||
import com.example.hpostesting.presentation.autodac.AutoDacActivity
|
import com.example.hpostesting.presentation.autodac.AutoDacActivity
|
||||||
import com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity
|
import com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity
|
||||||
import com.example.hpostesting.presentation.calibration.CalibrationActivity
|
import com.example.hpostesting.presentation.calibration.CalibrationActivity
|
||||||
import com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity
|
|
||||||
import com.example.hpostesting.presentation.deviceinfo.DeviceActivity
|
import com.example.hpostesting.presentation.deviceinfo.DeviceActivity
|
||||||
|
import com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity
|
||||||
import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
|
import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
|
||||||
import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
|
import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
|
||||||
import `in`.sminnovations.hpostesting.databinding.FragmentGalleryBinding
|
import `in`.sminnovations.hpostesting.databinding.FragmentGalleryBinding
|
||||||
|
|
||||||
|
|
||||||
class GalleryFragment : Fragment() {
|
class GalleryFragment : Fragment() {
|
||||||
|
|
||||||
private var _binding: FragmentGalleryBinding? = null
|
private var _binding: FragmentGalleryBinding? = null
|
||||||
@@ -82,6 +84,19 @@ class GalleryFragment : Fragment() {
|
|||||||
startActivity(Intent(requireContext(), DeviceActivity::class.java))
|
startActivity(Intent(requireContext(), DeviceActivity::class.java))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
binding.btnFirefox.setOnClickListener {
|
||||||
|
val intent = Intent(Intent.ACTION_VIEW)
|
||||||
|
intent.component = ComponentName("org.mozilla.firefox", "org.mozilla.gecko.BrowserApp")
|
||||||
|
startActivity(intent)
|
||||||
|
}
|
||||||
|
|
||||||
|
binding.btnFiles.setOnClickListener {
|
||||||
|
val intent = Intent(Intent.ACTION_GET_CONTENT)
|
||||||
|
intent.type = "file/*"
|
||||||
|
startActivity(intent)
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
userid = sharedPreferences.getString(Constants.USER_ID, "").toString()
|
userid = sharedPreferences.getString(Constants.USER_ID, "").toString()
|
||||||
binding.tvSubtitle4.text = "Login ID : ${userid}"
|
binding.tvSubtitle4.text = "Login ID : ${userid}"
|
||||||
|
|
||||||
|
|||||||
@@ -43,11 +43,19 @@ import com.google.firebase.perf.ktx.performance
|
|||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
import `in`.sminnovations.hpostesting.R
|
import `in`.sminnovations.hpostesting.R
|
||||||
import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
|
import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
|
||||||
|
import okhttp3.ResponseBody
|
||||||
import org.json.JSONObject
|
import org.json.JSONObject
|
||||||
|
import java.io.BufferedOutputStream
|
||||||
|
import java.io.File
|
||||||
|
import java.io.FileInputStream
|
||||||
|
import java.io.FileOutputStream
|
||||||
|
import java.net.URL
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.util.Calendar
|
import java.util.Calendar
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
import java.util.zip.ZipEntry
|
||||||
|
import java.util.zip.ZipInputStream
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
class HomeFragment : Fragment() {
|
class HomeFragment : Fragment() {
|
||||||
@@ -62,7 +70,6 @@ class HomeFragment : Fragment() {
|
|||||||
private val homeViewModel: HemoCubeViewModel by activityViewModels()
|
private val homeViewModel: HemoCubeViewModel by activityViewModels()
|
||||||
|
|
||||||
private var isTokenAvailable = false
|
private var isTokenAvailable = false
|
||||||
|
|
||||||
private lateinit var sharedPreference: SharedPreferences
|
private lateinit var sharedPreference: SharedPreferences
|
||||||
override fun onCreateView(
|
override fun onCreateView(
|
||||||
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
|
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
|
||||||
@@ -118,8 +125,6 @@ class HomeFragment : Fragment() {
|
|||||||
loadUserData()
|
loadUserData()
|
||||||
setSearch()
|
setSearch()
|
||||||
checkForLocalDBData()
|
checkForLocalDBData()
|
||||||
// This function could be called directly where you need to perform the login operation.
|
|
||||||
forceLogin()
|
|
||||||
checkForTokenAndUpdate()
|
checkForTokenAndUpdate()
|
||||||
} else {
|
} else {
|
||||||
binding.internetAvailableCL.visibility = View.GONE
|
binding.internetAvailableCL.visibility = View.GONE
|
||||||
@@ -190,31 +195,12 @@ class HomeFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private fun forceLogin() {
|
|
||||||
val password = sharedPreference.getString(Constants.DEVICE_PASSWORD_API, "").toString()
|
|
||||||
val userID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
|
|
||||||
if (userID.isNotEmpty() && password.isNotEmpty() ) {
|
|
||||||
// Directly call the login API without checking the access token
|
|
||||||
hemoCubeViewModel.login(createLoginRequestData(userID, password))
|
|
||||||
} else {
|
|
||||||
Toast.makeText(
|
|
||||||
requireContext(),
|
|
||||||
"Contact Help and get your device provision done",
|
|
||||||
Toast.LENGTH_SHORT
|
|
||||||
).show()
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private fun checkForTokenAndUpdate() {
|
private fun checkForTokenAndUpdate() {
|
||||||
val accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
|
val accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
|
||||||
val password = sharedPreference.getString(Constants.DEVICE_PASSWORD_API, "").toString()
|
val password = sharedPreference.getString(Constants.DEVICE_PASSWORD_API, "").toString()
|
||||||
val userID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
|
val userID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
|
||||||
if (accessToken.isEmpty()) {
|
if (userID.isNotEmpty() && password.isNotEmpty()) {
|
||||||
|
if (accessToken.isEmpty()) {
|
||||||
hemoCubeViewModel.login(createLoginRequestData(userID, password))
|
hemoCubeViewModel.login(createLoginRequestData(userID, password))
|
||||||
} else {
|
} else {
|
||||||
if (isTokenExpired(accessToken)) {
|
if (isTokenExpired(accessToken)) {
|
||||||
@@ -224,8 +210,21 @@ class HomeFragment : Fragment() {
|
|||||||
hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
|
hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
|
||||||
hemoCubeViewModel.uploadLogs()
|
hemoCubeViewModel.uploadLogs()
|
||||||
hemoCubeViewModel.startPeriodicCheckUpdate()
|
hemoCubeViewModel.startPeriodicCheckUpdate()
|
||||||
|
hemoCubeViewModel.downloadClientCertificate()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
Toast.makeText(
|
||||||
|
requireContext(),
|
||||||
|
"Contact Help and get your device provision done",
|
||||||
|
Toast.LENGTH_SHORT
|
||||||
|
).show()
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
hemoCubeViewModel.loginResponse.observe(viewLifecycleOwner) { response ->
|
hemoCubeViewModel.loginResponse.observe(viewLifecycleOwner) { response ->
|
||||||
when (response) {
|
when (response) {
|
||||||
is Result.Success -> {
|
is Result.Success -> {
|
||||||
@@ -280,6 +279,41 @@ class HomeFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
hemoCubeViewModel.downloadcertificate.observe(viewLifecycleOwner) { response ->
|
||||||
|
when (response) {
|
||||||
|
is Result.Success -> {
|
||||||
|
val url = response.data
|
||||||
|
|
||||||
|
val fileName = "nats_certificate.zip"
|
||||||
|
val downloadDirectory = "NATS"
|
||||||
|
val file = downloadFile(url, requireContext(), fileName, downloadDirectory)
|
||||||
|
Toast.makeText(requireContext(), "NATS certificate Downloaded", Toast.LENGTH_SHORT).show()
|
||||||
|
|
||||||
|
val unzipDirectoryPath = requireContext().getExternalFilesDir(null)?.absolutePath + "/$downloadDirectory"
|
||||||
|
unzip(file.absolutePath, unzipDirectoryPath)
|
||||||
|
Toast.makeText(requireContext(), "NATS certificate Extracted", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
is Result.Error -> {
|
||||||
|
response.exception.let { message ->
|
||||||
|
Toast.makeText(
|
||||||
|
activity,
|
||||||
|
"An error occurred in nats download: $message",
|
||||||
|
Toast.LENGTH_LONG
|
||||||
|
)
|
||||||
|
.show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
is Result.Loading -> {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
|
hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
|
||||||
when (it) {
|
when (it) {
|
||||||
is Result.Success -> {
|
is Result.Success -> {
|
||||||
@@ -304,8 +338,11 @@ class HomeFragment : Fragment() {
|
|||||||
else -> {}
|
else -> {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private fun isTokenExpired(token: String): Boolean {
|
private fun isTokenExpired(token: String): Boolean {
|
||||||
val parts = token.split("\\.".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
|
val parts = token.split("\\.".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
|
||||||
val decodedPayload = String(Base64.decode(parts[1], Base64.DEFAULT))
|
val decodedPayload = String(Base64.decode(parts[1], Base64.DEFAULT))
|
||||||
@@ -355,6 +392,60 @@ class HomeFragment : Fragment() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun downloadFile(responseBody: ResponseBody, context: Context, fileName: String, downloadDirectory: String): File {
|
||||||
|
// Ensure the download directory exists
|
||||||
|
val fileDir = File(context.getExternalFilesDir(null), downloadDirectory)
|
||||||
|
if (!fileDir.exists()) {
|
||||||
|
fileDir.mkdirs()
|
||||||
|
}
|
||||||
|
val file = File(fileDir, fileName)
|
||||||
|
Log.d("Download", "Starting download to $file")
|
||||||
|
responseBody.byteStream().use { inputStream ->
|
||||||
|
FileOutputStream(file).use { outputStream ->
|
||||||
|
inputStream.copyTo(outputStream)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// After download
|
||||||
|
Log.d("Download", "Download completed to ${file.absolutePath}")
|
||||||
|
|
||||||
|
return file
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
private fun unzip(zipFilePath: String, destDirectory: String) {
|
||||||
|
val destDir = File(destDirectory)
|
||||||
|
if (!destDir.exists()) {
|
||||||
|
destDir.mkdir()
|
||||||
|
}
|
||||||
|
ZipInputStream(FileInputStream(zipFilePath)).use { zipIn ->
|
||||||
|
var entry: ZipEntry? = zipIn.nextEntry
|
||||||
|
while (entry != null) {
|
||||||
|
val filePath = destDirectory + File.separator + entry.name
|
||||||
|
if (!entry.isDirectory) {
|
||||||
|
extractFile(zipIn, filePath)
|
||||||
|
} else {
|
||||||
|
val dir = File(filePath)
|
||||||
|
dir.mkdir()
|
||||||
|
}
|
||||||
|
zipIn.closeEntry()
|
||||||
|
entry = zipIn.nextEntry
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun extractFile(zipIn: ZipInputStream, filePath: String) {
|
||||||
|
BufferedOutputStream(FileOutputStream(filePath)).use { bos ->
|
||||||
|
val bytesIn = ByteArray(4096)
|
||||||
|
var read: Int
|
||||||
|
while (zipIn.read(bytesIn).also { read = it } != -1) {
|
||||||
|
bos.write(bytesIn, 0, read)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun setUserId() {
|
private fun setUserId() {
|
||||||
binding.btnSubmit.setOnClickListener {
|
binding.btnSubmit.setOnClickListener {
|
||||||
val userId = binding.userId.text.toString()
|
val userId = binding.userId.text.toString()
|
||||||
|
|||||||
@@ -24,15 +24,11 @@ import androidx.core.view.get
|
|||||||
import com.example.hpostesting.data.DataHolder
|
import com.example.hpostesting.data.DataHolder
|
||||||
import com.example.hpostesting.data.constant.Constants
|
import com.example.hpostesting.data.constant.Constants
|
||||||
import com.example.hpostesting.data.constant.LanguageManager
|
import com.example.hpostesting.data.constant.LanguageManager
|
||||||
import com.example.hpostesting.presentation.calibration.CalibrationFragment
|
|
||||||
import com.example.hpostesting.presentation.calibration.CalibrationViewModel
|
|
||||||
import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
|
|
||||||
import com.example.hpostesting.presentation.testRight.UsbService
|
import com.example.hpostesting.presentation.testRight.UsbService
|
||||||
import com.hoho.android.usbserial.driver.UsbSerialDriver
|
import com.hoho.android.usbserial.driver.UsbSerialDriver
|
||||||
import com.hoho.android.usbserial.driver.UsbSerialProber
|
import com.hoho.android.usbserial.driver.UsbSerialProber
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
import `in`.sminnovations.hpostesting.R
|
import `in`.sminnovations.hpostesting.R
|
||||||
import `in`.sminnovations.hpostesting.databinding.ActivityCalibrationBinding
|
|
||||||
import `in`.sminnovations.hpostesting.databinding.ActivityDeviceBinding
|
import `in`.sminnovations.hpostesting.databinding.ActivityDeviceBinding
|
||||||
|
|
||||||
@Suppress("MemberVisibilityCanBePrivate")
|
@Suppress("MemberVisibilityCanBePrivate")
|
||||||
@@ -148,18 +144,18 @@ class DeviceActivity : AppCompatActivity() {
|
|||||||
val mPendingIntent: PendingIntent
|
val mPendingIntent: PendingIntent
|
||||||
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
||||||
mPendingIntent = PendingIntent.getBroadcast(
|
mPendingIntent = PendingIntent.getBroadcast(
|
||||||
this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
mPendingIntent = PendingIntent.getBroadcast(
|
mPendingIntent = PendingIntent.getBroadcast(
|
||||||
this,
|
this,
|
||||||
0,
|
0,
|
||||||
Intent(Constants.HOMOCUBE_USB_PERMISSION),
|
Intent(Constants.HEMOCUBE_USB_PERMISSION),
|
||||||
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
|
val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
|
||||||
registerReceiver(broadcastReceiver, filter)
|
registerReceiver(broadcastReceiver, filter)
|
||||||
manager.requestPermission(device, mPendingIntent)
|
manager.requestPermission(device, mPendingIntent)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ import android.annotation.SuppressLint
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.fragment.app.Fragment
|
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.activityViewModels
|
import androidx.fragment.app.activityViewModels
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import com.example.hpostesting.data.constant.Constants
|
import com.example.hpostesting.data.constant.Constants
|
||||||
@@ -32,7 +32,7 @@ class DeviceFragment : Fragment() {
|
|||||||
): View {
|
): View {
|
||||||
binding = FragmentDeviceBinding.inflate(inflater, container, false)
|
binding = FragmentDeviceBinding.inflate(inflater, container, false)
|
||||||
sharedPreferences =
|
sharedPreferences =
|
||||||
requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
|
requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
|
||||||
return binding.root
|
return binding.root
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
package com.example.hpostesting.presentation.deviceinfo
|
package com.example.hpostesting.presentation.deviceinfo
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import androidx.lifecycle.LiveData
|
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import com.example.hpostesting.data.NetworkStatusLiveData
|
|
||||||
import com.example.hpostesting.data.dao.HemoCubeDao
|
import com.example.hpostesting.data.dao.HemoCubeDao
|
||||||
import com.example.hpostesting.data.model.patient.DeviceData
|
import com.example.hpostesting.data.model.patient.DeviceData
|
||||||
import com.example.hpostesting.data.repository.Repository
|
import com.example.hpostesting.data.repository.Repository
|
||||||
@@ -14,16 +11,15 @@ import javax.inject.Inject
|
|||||||
class DeviceViewModel @Inject constructor(
|
class DeviceViewModel @Inject constructor(
|
||||||
private val hemoCubeDao: HemoCubeDao,
|
private val hemoCubeDao: HemoCubeDao,
|
||||||
private val repository: Repository,
|
private val repository: Repository,
|
||||||
context: Context
|
|
||||||
) : ViewModel() {
|
) : ViewModel() {
|
||||||
var isServiceConnected = false
|
var isServiceConnected = false
|
||||||
val progressBar = MutableLiveData(false)
|
val progressBar = MutableLiveData(false)
|
||||||
val messages = MutableLiveData<String>()
|
val messages = MutableLiveData<String>()
|
||||||
private val _networkStatusLiveData = NetworkStatusLiveData(context)
|
// private val _networkStatusLiveData = NetworkStatusLiveData(context)
|
||||||
val allUserData = hemoCubeDao.getAll()
|
// val allUserData = hemoCubeDao.getAll()
|
||||||
val deviceData = MutableLiveData<DeviceData?>()
|
val deviceData = MutableLiveData<DeviceData?>()
|
||||||
val networkStatusLiveData: LiveData<Boolean>
|
// val networkStatusLiveData: LiveData<Boolean>
|
||||||
get() = _networkStatusLiveData
|
// get() = _networkStatusLiveData
|
||||||
val fireBaseUpload = MutableLiveData<String>()
|
val fireBaseUpload = MutableLiveData<String>()
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -144,18 +144,18 @@ class DeviceProvisionActivity : AppCompatActivity() {
|
|||||||
private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
|
private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
|
||||||
val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
||||||
PendingIntent.getBroadcast(
|
PendingIntent.getBroadcast(
|
||||||
this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
PendingIntent.getBroadcast(
|
PendingIntent.getBroadcast(
|
||||||
this,
|
this,
|
||||||
0,
|
0,
|
||||||
Intent(Constants.HOMOCUBE_USB_PERMISSION),
|
Intent(Constants.HEMOCUBE_USB_PERMISSION),
|
||||||
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
|
val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
|
||||||
registerReceiver(broadcastReceiver, filter)
|
registerReceiver(broadcastReceiver, filter)
|
||||||
manager.requestPermission(device, mPendingIntent)
|
manager.requestPermission(device, mPendingIntent)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import android.content.Context
|
|||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
|
import android.util.Log
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
@@ -74,6 +75,11 @@ class DeviceProvisionFragment : Fragment() {
|
|||||||
Constants.NATS_TOKEN,
|
Constants.NATS_TOKEN,
|
||||||
response.data.data?.device?.deviceUser?.natsToken
|
response.data.data?.device?.deviceUser?.natsToken
|
||||||
)
|
)
|
||||||
|
response.data.data?.device?.deviceUser?.natsToken?.let {
|
||||||
|
Log.e("natstoken",
|
||||||
|
it
|
||||||
|
)
|
||||||
|
}
|
||||||
putString(
|
putString(
|
||||||
Constants.NATS_TOKEN_EXPIRE_DATE,
|
Constants.NATS_TOKEN_EXPIRE_DATE,
|
||||||
response.data.data?.device?.deviceUser?.natsTokenExpiry
|
response.data.data?.device?.deviceUser?.natsTokenExpiry
|
||||||
@@ -114,7 +120,6 @@ class DeviceProvisionFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private fun getDeviceId() {
|
private fun getDeviceId() {
|
||||||
(activity as DeviceProvisionActivity).mService.sendAndListenToHemoCube(
|
(activity as DeviceProvisionActivity).mService.sendAndListenToHemoCube(
|
||||||
HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
|
HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
|
||||||
@@ -146,40 +151,19 @@ class DeviceProvisionFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// private fun handleUsbData() {
|
fun extractV2HardwareId(input: String): String? {
|
||||||
// when {
|
val pattern = Regex("SNS\\s*(.*?)\\s*SNE")
|
||||||
// resultData.contains("SNE") -> {
|
val matchResult: MatchResult? = pattern.find(input)
|
||||||
// val pattern = Regex("HPP1-\\d{4}")
|
|
||||||
// val matchResult = pattern.find(resultData)
|
|
||||||
// val hardwareId = matchResult?.value
|
|
||||||
//
|
|
||||||
// if (hardwareId.toString().length == 9) {
|
|
||||||
// with(sharedPreferences.edit()) {
|
|
||||||
// putString(Constants.DEVICE_ID, hardwareId)
|
|
||||||
// apply()
|
|
||||||
// }
|
|
||||||
// activity?.runOnUiThread {
|
|
||||||
// binding.btnSubmit.visibility = View.VISIBLE
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
return matchResult?.groups?.get(1)?.value
|
||||||
|
}
|
||||||
|
|
||||||
private fun handleUsbData() {
|
private fun handleUsbData() {
|
||||||
when {
|
when {
|
||||||
resultData.contains("SNE") -> {
|
resultData.contains("SNE") -> {
|
||||||
// Updated pattern to match all specified formats
|
val hardwareId = extractV2HardwareId(resultData)
|
||||||
val pattern = Regex("HPP1-\\d{4}|HPP1-\\d{3}-\\d{4}|HCV-\\d{3}-\\d{4}")
|
|
||||||
val matchResult = pattern.find(resultData)
|
|
||||||
val hardwareId = matchResult?.value
|
|
||||||
|
|
||||||
// Assuming hardwareId validation is based on matching the pattern,
|
if (!hardwareId.isNullOrBlank()) {
|
||||||
// so no need to check length explicitly here.
|
|
||||||
// If there are more specific requirements for validation,
|
|
||||||
// they need to be implemented accordingly.
|
|
||||||
if (hardwareId != null) { // Check if hardwareId is not null instead
|
|
||||||
with(sharedPreferences.edit()) {
|
with(sharedPreferences.edit()) {
|
||||||
putString(Constants.DEVICE_ID, hardwareId)
|
putString(Constants.DEVICE_ID, hardwareId)
|
||||||
apply()
|
apply()
|
||||||
@@ -191,5 +175,4 @@ class DeviceProvisionFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -23,8 +23,6 @@ import androidx.core.view.get
|
|||||||
import com.example.hpostesting.data.DataHolder
|
import com.example.hpostesting.data.DataHolder
|
||||||
import com.example.hpostesting.data.constant.Constants
|
import com.example.hpostesting.data.constant.Constants
|
||||||
import com.example.hpostesting.data.constant.LanguageManager
|
import com.example.hpostesting.data.constant.LanguageManager
|
||||||
import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
|
|
||||||
import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
|
|
||||||
import com.example.hpostesting.presentation.testRight.UsbService
|
import com.example.hpostesting.presentation.testRight.UsbService
|
||||||
import com.hoho.android.usbserial.driver.UsbSerialDriver
|
import com.hoho.android.usbserial.driver.UsbSerialDriver
|
||||||
import com.hoho.android.usbserial.driver.UsbSerialProber
|
import com.hoho.android.usbserial.driver.UsbSerialProber
|
||||||
@@ -148,18 +146,18 @@ class DiagnosticsActivity : AppCompatActivity() {
|
|||||||
val mPendingIntent: PendingIntent
|
val mPendingIntent: PendingIntent
|
||||||
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
||||||
mPendingIntent = PendingIntent.getBroadcast(
|
mPendingIntent = PendingIntent.getBroadcast(
|
||||||
this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
mPendingIntent = PendingIntent.getBroadcast(
|
mPendingIntent = PendingIntent.getBroadcast(
|
||||||
this,
|
this,
|
||||||
0,
|
0,
|
||||||
Intent(Constants.HOMOCUBE_USB_PERMISSION),
|
Intent(Constants.HEMOCUBE_USB_PERMISSION),
|
||||||
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
|
val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
|
||||||
registerReceiver(broadcastReceiver, filter)
|
registerReceiver(broadcastReceiver, filter)
|
||||||
manager.requestPermission(device, mPendingIntent)
|
manager.requestPermission(device, mPendingIntent)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -148,6 +148,9 @@ class DiagnosticsFragment : Fragment() {
|
|||||||
if (resultData.contains("END") || fullReadOutput.contains("END")) {
|
if (resultData.contains("END") || fullReadOutput.contains("END")) {
|
||||||
diagnosticsViewModel.addDiagnosticsDataToDb(DiagnosticsData(
|
diagnosticsViewModel.addDiagnosticsDataToDb(DiagnosticsData(
|
||||||
deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
|
deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
|
||||||
|
devicePassword = sharedPreferences.getString(Constants.DEVICE_PASSWORD_API, "").toString(),
|
||||||
|
deviceNatsToken = sharedPreferences.getString(Constants.NATS_TOKEN, "").toString(),
|
||||||
|
accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString(),
|
||||||
deviceData = resultData,
|
deviceData = resultData,
|
||||||
runTime = SimpleDateFormat(
|
runTime = SimpleDateFormat(
|
||||||
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ class HemoCubeFragment : Fragment() {
|
|||||||
when (it) {
|
when (it) {
|
||||||
is Result.Success -> {
|
is Result.Success -> {
|
||||||
uploadedToMolbio = true
|
uploadedToMolbio = true
|
||||||
if (Constants.MOLBIO_INTERGATION) {
|
if (Constants.MOLBIO_INTEGRATION) {
|
||||||
it.data.data?.get(0)?.rawData?.let { it1 ->
|
it.data.data?.get(0)?.rawData?.let { it1 ->
|
||||||
hemoCubeViewModel.updateMolbioFlag(
|
hemoCubeViewModel.updateMolbioFlag(
|
||||||
it1._id
|
it1._id
|
||||||
@@ -643,10 +643,10 @@ class HemoCubeFragment : Fragment() {
|
|||||||
|
|
||||||
if (!Constants.DEVICE_CONFIGURATION.containsKey(deviceHardwareId)) {
|
if (!Constants.DEVICE_CONFIGURATION.containsKey(deviceHardwareId)) {
|
||||||
assignDefaultDevice(resultData)
|
assignDefaultDevice(resultData)
|
||||||
testState.allErrorMessages += "Calibration configuration for this device id is not found\n"
|
// testState.allErrorMessages += "Calibration configuration for this device id is not found\n"
|
||||||
}
|
}
|
||||||
if (!Constants.BUFFER_INTENSITY_THRESHOLDS.containsKey(deviceHardwareId)) {
|
if (!Constants.BUFFER_INTENSITY_THRESHOLDS.containsKey(deviceHardwareId)) {
|
||||||
testState.allErrorMessages += "ADC thresholds for this device id are not found\n"
|
// testState.allErrorMessages += "ADC thresholds for this device id are not found\n"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -743,9 +743,9 @@ class HemoCubeFragment : Fragment() {
|
|||||||
)?.get(0)!!
|
)?.get(0)!!
|
||||||
) {
|
) {
|
||||||
// validationError = true
|
// validationError = true
|
||||||
testState.allErrorMessages += "Error: Invalid Test. Improper buffer reading (low)"
|
// testState.allErrorMessages += "Error: Invalid Test. Improper buffer reading (low)"
|
||||||
activity?.runOnUiThread {
|
activity?.runOnUiThread {
|
||||||
binding.errorMessage.text = getString(R.string.error_improper_buffer_low)
|
// binding.errorMessage.text = getString(R.string.error_improper_buffer_low)
|
||||||
// binding.errorMessage.visibility = View.VISIBLE
|
// binding.errorMessage.visibility = View.VISIBLE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -763,11 +763,11 @@ class HemoCubeFragment : Fragment() {
|
|||||||
)?.get(1)!!
|
)?.get(1)!!
|
||||||
) {
|
) {
|
||||||
// validationError = true
|
// validationError = true
|
||||||
testState.allErrorMessages += "Error: Invalid Test. Improper buffer reading (high)" + "\n"
|
// testState.allErrorMessages += "Error: Invalid Test. Improper buffer reading (high)" + "\n"
|
||||||
activity?.runOnUiThread {
|
activity?.runOnUiThread {
|
||||||
binding.errorMessage.text =
|
// binding.errorMessage.text =
|
||||||
getString(R.string.error_improper_buffer_high)
|
getString(R.string.error_improper_buffer_high)
|
||||||
binding.errorMessage.visibility = View.VISIBLE
|
// binding.errorMessage.visibility = View.VISIBLE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -805,15 +805,15 @@ class HemoCubeFragment : Fragment() {
|
|||||||
|
|
||||||
calculatedPredictedDenovixRatio = fittedAbs3.div(fittedAbs1)
|
calculatedPredictedDenovixRatio = fittedAbs3.div(fittedAbs1)
|
||||||
|
|
||||||
val slope = (led1Average - led2Average) / (435 - 415)
|
val slope = (led4Average - led1Average) / (431-411)
|
||||||
val calculatedSlopeRatio = abs(led3Average / slope)
|
val calculatedSlopeRatio = abs(led2Average / slope)
|
||||||
val slopeClass = slopeRatioClassification(calculatedSlopeRatio)
|
val slopeClass = slopeRatioClassification(calculatedSlopeRatio)
|
||||||
|
|
||||||
if (fittedAbs1 <= fittedAbs2) {
|
if (fittedAbs1 <= fittedAbs2) {
|
||||||
// validationError = true
|
// validationError = true
|
||||||
testState.allErrorMessages += "Error: Invalid Test. Problem with de-oxygenation" + "\n"
|
// testState.allErrorMessages += "Error: Invalid Test. Problem with de-oxygenation" + "\n"
|
||||||
activity?.runOnUiThread {
|
activity?.runOnUiThread {
|
||||||
binding.errorMessage.text = getString(R.string.error_invalid_test)
|
// binding.errorMessage.text = getString(R.string.error_invalid_test)
|
||||||
// binding.errorMessage.visibility = View.VISIBLE
|
// binding.errorMessage.visibility = View.VISIBLE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -837,9 +837,9 @@ class HemoCubeFragment : Fragment() {
|
|||||||
|
|
||||||
if (fittedAbs3 < 0.1) {
|
if (fittedAbs3 < 0.1) {
|
||||||
// validationError = true
|
// validationError = true
|
||||||
testState.allErrorMessages += "Error: Low Hb. Repeat test" + "\n"
|
// testState.allErrorMessages += "Error: Low Hb. Repeat test" + "\n"
|
||||||
activity?.runOnUiThread {
|
activity?.runOnUiThread {
|
||||||
binding.errorMessage.text = "Error: Low Hb. Repeat test"
|
// binding.errorMessage.text = "Error: Low Hb. Repeat test"
|
||||||
// binding.errorMessage.visibility = View.VISIBLE
|
// binding.errorMessage.visibility = View.VISIBLE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -874,8 +874,8 @@ class HemoCubeFragment : Fragment() {
|
|||||||
this.prdClassification = absorbanceBasedClassification(predictedDenovixRatio)
|
this.prdClassification = absorbanceBasedClassification(predictedDenovixRatio)
|
||||||
this.deviceRatioClass = deviceRatioClassification(deviceRatio)
|
this.deviceRatioClass = deviceRatioClassification(deviceRatio)
|
||||||
this.slopeRatioClass = slopeClass
|
this.slopeRatioClass = slopeClass
|
||||||
this.classificationResult = deviceRatioClass //findResult(calculatedRatio)
|
this.classificationResult = deviceRatioClass
|
||||||
hemoCubeViewModel.messages.postValue("${this.deviceRatioClass} ${if (led4Average < 0.17) " - Low Hb" else ""}\n")
|
hemoCubeViewModel.messages.postValue("${this.classificationResult} \n Device Ratio: ${"%.3f".format(this.deviceRatio)}")
|
||||||
if (DataHolder.hemoCubeTestData?.testType == "HB")
|
if (DataHolder.hemoCubeTestData?.testType == "HB")
|
||||||
hemoCubeViewModel.messages.postValue("Hb: $calculatedHb4")
|
hemoCubeViewModel.messages.postValue("Hb: $calculatedHb4")
|
||||||
this.errorMessages = testState.allErrorMessages
|
this.errorMessages = testState.allErrorMessages
|
||||||
@@ -909,50 +909,36 @@ class HemoCubeFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun findResult(calculatedRatio: Double?): String {
|
fun findResultWithAdditionalMethods(deviceRatio: Double?, deviceRatioClass: String?, slopeRatio: Double?): String {
|
||||||
try {
|
try {
|
||||||
hemoCubeViewModel.messages.postValue("result classification")
|
// hemoCubeViewModel.messages.postValue("post classification checks")
|
||||||
if (calculatedRatio != null) {
|
if (deviceRatio != null) {
|
||||||
if (calculatedRatio < 0.05)
|
if (slopeRatio != null) {
|
||||||
return getString(R.string.error_repeat_test_higher_volume)
|
if (deviceRatioClass == "Normal" && slopeRatio > 45.0)
|
||||||
if (calculatedRatio in 0.05..0.155) {
|
return "Negative Borderline, Repeat Test"
|
||||||
return getString(R.string.normal)
|
|
||||||
}
|
}
|
||||||
if (calculatedRatio in 0.155..0.175)
|
|
||||||
return getString(R.string.negative_borderline)
|
|
||||||
if (calculatedRatio in 0.175..0.22)
|
|
||||||
return getString(R.string.sickle_cell_trait)
|
|
||||||
if (calculatedRatio in 0.22..0.25)
|
|
||||||
return getString(R.string.positive_for_sickle_cell)
|
|
||||||
if (calculatedRatio in 0.25..0.35)
|
|
||||||
return getString(R.string.sickle_cell_disease)
|
|
||||||
if (calculatedRatio > 0.35)
|
|
||||||
return getString(R.string.error_repeat_test_lower_volume)
|
|
||||||
} else {
|
|
||||||
return getString(R.string.invalid)
|
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
showToast(R.string.error_classification)
|
handleException(e)
|
||||||
Firebase.crashlytics.recordException(e)
|
return "Error"
|
||||||
return getString(R.string.error)
|
|
||||||
}
|
}
|
||||||
return getString(R.string.invalid)
|
return deviceRatioClass.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun deviceRatioClassification(ratio: Double?): String {
|
fun deviceRatioClassification(ratio: Double?): String {
|
||||||
try {
|
try {
|
||||||
if (ratio != null) {
|
if (ratio != null) {
|
||||||
if (ratio in 0.1..0.29) {
|
if (ratio in 0.016..0.22) {
|
||||||
// setSubtitleTextColor(R.color.green_2)
|
// setSubtitleTextColor(R.color.green_2)
|
||||||
return "Normal"
|
return "Normal"
|
||||||
}
|
}
|
||||||
if (ratio in 0.29..0.32)
|
if (ratio in 0.22..0.24)
|
||||||
return "Negative Borderline, Repeat Test"
|
return "Negative Borderline"
|
||||||
if (ratio in 0.32..0.35)
|
if (ratio in 0.24..0.32)
|
||||||
return "Sickle Cell Trait"
|
return "Sickle Cell Trait"
|
||||||
if (ratio in 0.35..0.38)
|
if (ratio in 0.32..0.37)
|
||||||
return "Positive for Sickle Cell. HPLC for Confirmation"
|
return "Positive for Sickle Cell. HPLC for Confirmation"
|
||||||
if (ratio in 0.38..0.5)
|
if (ratio in 0.37..0.56)
|
||||||
return "Sickle Cell Disease"
|
return "Sickle Cell Disease"
|
||||||
} else {
|
} else {
|
||||||
return "Invalid"
|
return "Invalid"
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ class HemoCubeViewModel @Inject constructor(
|
|||||||
val checkUpdate = MutableLiveData<Result<CheckUpdateResponse>>()
|
val checkUpdate = MutableLiveData<Result<CheckUpdateResponse>>()
|
||||||
|
|
||||||
val deviceUpdate = MutableLiveData<Result<ResponseBody>>()
|
val deviceUpdate = MutableLiveData<Result<ResponseBody>>()
|
||||||
|
val downloadcertificate = MutableLiveData<Result<ResponseBody>>()
|
||||||
|
|
||||||
val uploadLogs = MutableLiveData<Result<UploadLogsResponse>?>()
|
val uploadLogs = MutableLiveData<Result<UploadLogsResponse>?>()
|
||||||
|
|
||||||
@@ -141,6 +142,9 @@ class HemoCubeViewModel @Inject constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
fun checkUpdate(checkUpdateRequest: CheckUpdateRequest) = viewModelScope.launch {
|
fun checkUpdate(checkUpdateRequest: CheckUpdateRequest) = viewModelScope.launch {
|
||||||
checkUpdate.postValue(Result.Loading())
|
checkUpdate.postValue(Result.Loading())
|
||||||
repository.checkUpdate(checkUpdateRequest).let {
|
repository.checkUpdate(checkUpdateRequest).let {
|
||||||
@@ -155,6 +159,17 @@ class HemoCubeViewModel @Inject constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
fun downloadClientCertificate() = viewModelScope.launch {
|
||||||
|
downloadcertificate.postValue(Result.Loading())
|
||||||
|
repository.downloadClientCertificate().let {
|
||||||
|
downloadcertificate.postValue(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
fun startPeriodicCheckUpdate() {
|
fun startPeriodicCheckUpdate() {
|
||||||
val periodicRequest = PeriodicWorkRequestBuilder<CheckUpdateWorker>(
|
val periodicRequest = PeriodicWorkRequestBuilder<CheckUpdateWorker>(
|
||||||
repeatInterval = 1, repeatIntervalTimeUnit = TimeUnit.MINUTES
|
repeatInterval = 1, repeatIntervalTimeUnit = TimeUnit.MINUTES
|
||||||
|
|||||||
@@ -11,12 +11,14 @@ import android.content.ServiceConnection
|
|||||||
import android.hardware.usb.UsbDevice
|
import android.hardware.usb.UsbDevice
|
||||||
import android.hardware.usb.UsbDeviceConnection
|
import android.hardware.usb.UsbDeviceConnection
|
||||||
import android.hardware.usb.UsbManager
|
import android.hardware.usb.UsbManager
|
||||||
|
import android.os.Build
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.os.IBinder
|
import android.os.IBinder
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.view.Menu
|
import android.view.Menu
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.activity.viewModels
|
import androidx.activity.viewModels
|
||||||
|
import androidx.annotation.RequiresApi
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.core.view.get
|
import androidx.core.view.get
|
||||||
@@ -43,6 +45,7 @@ open class HemocubeActivity : AppCompatActivity() {
|
|||||||
private val TAG = "HemoCube"
|
private val TAG = "HemoCube"
|
||||||
|
|
||||||
private val broadcastReceiver = object : BroadcastReceiver() {
|
private val broadcastReceiver = object : BroadcastReceiver() {
|
||||||
|
@RequiresApi(Build.VERSION_CODES.O)
|
||||||
override fun onReceive(context: Context, intent: Intent) {
|
override fun onReceive(context: Context, intent: Intent) {
|
||||||
|
|
||||||
synchronized(this) {
|
synchronized(this) {
|
||||||
@@ -81,6 +84,7 @@ open class HemocubeActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@RequiresApi(Build.VERSION_CODES.O)
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
binding = ActivityHemocubeBinding.inflate(layoutInflater)
|
binding = ActivityHemocubeBinding.inflate(layoutInflater)
|
||||||
@@ -105,6 +109,7 @@ open class HemocubeActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@RequiresApi(Build.VERSION_CODES.O)
|
||||||
open fun connectUsb(permissionGranted: Boolean) {
|
open fun connectUsb(permissionGranted: Boolean) {
|
||||||
Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
|
Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
|
||||||
val manager = getSystemService(Context.USB_SERVICE) as UsbManager
|
val manager = getSystemService(Context.USB_SERVICE) as UsbManager
|
||||||
@@ -125,32 +130,40 @@ open class HemocubeActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@SuppressLint("MutableImplicitPendingIntent")
|
@RequiresApi(Build.VERSION_CODES.O)
|
||||||
|
@SuppressLint("UnspecifiedImmutableFlag")
|
||||||
private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
|
private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
|
||||||
val mPendingIntent: PendingIntent
|
val mPendingIntent: PendingIntent
|
||||||
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
val pendingIntentFlags = when {
|
||||||
mPendingIntent = PendingIntent.getBroadcast(
|
Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
|
||||||
this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
PendingIntent.FLAG_IMMUTABLE
|
||||||
)
|
}
|
||||||
} else {
|
else -> {
|
||||||
mPendingIntent = PendingIntent.getBroadcast(
|
|
||||||
this,
|
|
||||||
0,
|
|
||||||
Intent(Constants.HOMOCUBE_USB_PERMISSION),
|
|
||||||
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
||||||
)
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
|
mPendingIntent = PendingIntent.getBroadcast(
|
||||||
registerReceiver(broadcastReceiver, filter)
|
this,
|
||||||
|
0,
|
||||||
|
Intent(Constants.HEMOCUBE_USB_PERMISSION),
|
||||||
|
pendingIntentFlags
|
||||||
|
)
|
||||||
|
|
||||||
|
val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
|
||||||
|
registerReceiver(broadcastReceiver, filter, RECEIVER_EXPORTED)
|
||||||
|
|
||||||
|
// Request permission
|
||||||
manager.requestPermission(device, mPendingIntent)
|
manager.requestPermission(device, mPendingIntent)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
fun setupService() {
|
fun setupService() {
|
||||||
val intent = Intent(this, UsbService::class.java)
|
val intent = Intent(this, UsbService::class.java)
|
||||||
bindService(intent, connection, Context.BIND_AUTO_CREATE)
|
bindService(intent, connection, Context.BIND_AUTO_CREATE)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@RequiresApi(Build.VERSION_CODES.O)
|
||||||
open fun reconnectDevice() {
|
open fun reconnectDevice() {
|
||||||
mService.disconnect()
|
mService.disconnect()
|
||||||
unbindService(connection)
|
unbindService(connection)
|
||||||
|
|||||||
@@ -127,23 +127,23 @@ class TrueHemeActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@SuppressLint("MutableImplicitPendingIntent")
|
@SuppressLint("MutableImplicitPendingIntent", "UnspecifiedRegisterReceiverFlag")
|
||||||
private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
|
private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
|
||||||
val mPendingIntent: PendingIntent
|
val mPendingIntent: PendingIntent
|
||||||
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
||||||
mPendingIntent = PendingIntent.getBroadcast(
|
mPendingIntent = PendingIntent.getBroadcast(
|
||||||
this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
mPendingIntent = PendingIntent.getBroadcast(
|
mPendingIntent = PendingIntent.getBroadcast(
|
||||||
this,
|
this,
|
||||||
0,
|
0,
|
||||||
Intent(Constants.HOMOCUBE_USB_PERMISSION),
|
Intent(Constants.HEMOCUBE_USB_PERMISSION),
|
||||||
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
|
val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
|
||||||
registerReceiver(broadcastReceiver, filter)
|
registerReceiver(broadcastReceiver, filter)
|
||||||
manager.requestPermission(device, mPendingIntent)
|
manager.requestPermission(device, mPendingIntent)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.example.hpostesting.presentation.trueheme
|
package com.example.hpostesting.presentation.trueheme
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
@@ -33,6 +34,7 @@ import kotlin.math.abs
|
|||||||
import kotlin.math.log10
|
import kotlin.math.log10
|
||||||
|
|
||||||
@Suppress("MemberVisibilityCanBePrivate")
|
@Suppress("MemberVisibilityCanBePrivate")
|
||||||
|
@SuppressLint("SetTextI18n")
|
||||||
class TrueHemeFragment : Fragment() {
|
class TrueHemeFragment : Fragment() {
|
||||||
|
|
||||||
private lateinit var binding: FragmentTruehemeSampleBinding
|
private lateinit var binding: FragmentTruehemeSampleBinding
|
||||||
@@ -154,7 +156,7 @@ class TrueHemeFragment : Fragment() {
|
|||||||
when (it) {
|
when (it) {
|
||||||
is Result.Success -> {
|
is Result.Success -> {
|
||||||
uploadedToMolbio = true
|
uploadedToMolbio = true
|
||||||
if (Constants.MOLBIO_INTERGATION) {
|
if (Constants.MOLBIO_INTEGRATION) {
|
||||||
it.data.data?.get(0)?.rawData?.let { it1 ->
|
it.data.data?.get(0)?.rawData?.let { it1 ->
|
||||||
hemoCubeViewModel.updateMolbioFlag(
|
hemoCubeViewModel.updateMolbioFlag(
|
||||||
it1._id
|
it1._id
|
||||||
@@ -1141,4 +1143,8 @@ class TrueHemeFragment : Fragment() {
|
|||||||
val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 0.0
|
val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 0.0
|
||||||
return coefficient1 * ratio + coefficient2
|
return coefficient1 * ratio + coefficient2
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun reconnect() {
|
||||||
|
(activity as HemocubeActivity).reconnectDevice()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
5
app/src/main/res/drawable/downloads.xml
Normal file
5
app/src/main/res/drawable/downloads.xml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
<vector android:height="24dp" android:tint="@color/primary"
|
||||||
|
android:viewportHeight="24" android:viewportWidth="24"
|
||||||
|
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<path android:fillColor="@color/primary" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
|
||||||
|
</vector>
|
||||||
@@ -108,4 +108,33 @@
|
|||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/btn_calibration" />
|
app:layout_constraintTop_toBottomOf="@id/btn_calibration" />
|
||||||
|
|
||||||
|
|
||||||
|
<com.google.android.material.button.MaterialButton
|
||||||
|
android:id="@+id/btn_firefox"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="16dp"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:clickable="false"
|
||||||
|
android:text="@string/Firefox"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
app:cornerRadius="16dp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />
|
||||||
|
|
||||||
|
<com.google.android.material.button.MaterialButton
|
||||||
|
android:id="@+id/btn_files"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="16dp"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:clickable="false"
|
||||||
|
android:text="@string/Files"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
app:cornerRadius="16dp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/btn_firefox" />
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -115,6 +115,8 @@
|
|||||||
<string name="assurance_controls">Quality Assurance</string>
|
<string name="assurance_controls">Quality Assurance</string>
|
||||||
<string name="calibration">Calibration</string>
|
<string name="calibration">Calibration</string>
|
||||||
<string name="deviceProvision">Device Provision</string>
|
<string name="deviceProvision">Device Provision</string>
|
||||||
|
<string name="Firefox">Firefox</string>
|
||||||
|
<string name="Files">Files</string>
|
||||||
<string name="deviceinfo">Device Information</string>
|
<string name="deviceinfo">Device Information</string>
|
||||||
<string name="place_buffer">Start</string>
|
<string name="place_buffer">Start</string>
|
||||||
<string name="Start_Sample">Start Sample</string>
|
<string name="Start_Sample">Start Sample</string>
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package com.example.hpostesting
|
||||||
|
|
||||||
|
//
|
||||||
|
//@PrepareForTest(Object::class)
|
||||||
|
//class AuthInterceptorTest {
|
||||||
|
//
|
||||||
|
//// @Rule
|
||||||
|
//// val rule = PowerMockRule()
|
||||||
|
//
|
||||||
|
// @Mock
|
||||||
|
// private lateinit var sharedPreferences: SharedPreferences
|
||||||
|
//
|
||||||
|
// @Mock
|
||||||
|
// private lateinit var chain: Interceptor.Chain
|
||||||
|
//
|
||||||
|
// @Mock
|
||||||
|
// private lateinit var request: okhttp3.Request
|
||||||
|
//
|
||||||
|
// @Mock
|
||||||
|
// private lateinit var response: Response
|
||||||
|
//
|
||||||
|
// @Captor
|
||||||
|
// private lateinit var captor: ArgumentCaptor<okhttp3.Request>
|
||||||
|
//
|
||||||
|
// private lateinit var authInterceptor: AuthInterceptor
|
||||||
|
//
|
||||||
|
// @Before
|
||||||
|
// fun setup() {
|
||||||
|
// MockitoAnnotations.initMocks(this)
|
||||||
|
// authInterceptor = AuthInterceptor(sharedPreferences)
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// @Test
|
||||||
|
// fun intercept_withToken_shouldAddAuthorizationHeader() {
|
||||||
|
// // Arrange
|
||||||
|
// val accessToken = "fakeAccessToken"
|
||||||
|
// `when`(sharedPreferences.getString(Constants.ACCESS_TOKEN, null)).thenReturn(accessToken)
|
||||||
|
// `when`(chain.request()).thenReturn(request)
|
||||||
|
// `when`(chain.proceed(request)).thenReturn(response)
|
||||||
|
//
|
||||||
|
// // Act
|
||||||
|
// val result = authInterceptor.intercept(chain)
|
||||||
|
//
|
||||||
|
// // Assert
|
||||||
|
// verify(chain).proceed(captor.capture())
|
||||||
|
// assertEquals("Bearer $accessToken", captor.value.header("Authorization"))
|
||||||
|
// assertEquals(response, result)
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// @Test
|
||||||
|
// fun intercept_withoutToken_shouldNotAddAuthorizationHeader() {
|
||||||
|
// // Arrange
|
||||||
|
// `when`(sharedPreferences.getString(Constants.ACCESS_TOKEN, null)).thenReturn(null)
|
||||||
|
// `when`(chain.request()).thenReturn(request)
|
||||||
|
// `when`(chain.proceed(request)).thenReturn(response)
|
||||||
|
//
|
||||||
|
// // Act
|
||||||
|
// val result = authInterceptor.intercept(chain)
|
||||||
|
//
|
||||||
|
// // Assert
|
||||||
|
// verify(chain).proceed(captor.capture())
|
||||||
|
// assertEquals(null, captor.value.header("Authorization"))
|
||||||
|
// assertEquals(response, result)
|
||||||
|
// }
|
||||||
|
//}
|
||||||
67
app/src/test/java/com/example/hpostesting/CsvWriterTest.kt
Normal file
67
app/src/test/java/com/example/hpostesting/CsvWriterTest.kt
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
package com.example.hpostesting
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import com.example.hpostesting.data.CsvWriter
|
||||||
|
import org.junit.Assert
|
||||||
|
import org.junit.Before
|
||||||
|
import org.junit.Test
|
||||||
|
import org.junit.runner.RunWith
|
||||||
|
import org.robolectric.RobolectricTestRunner
|
||||||
|
import org.robolectric.annotation.Config
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner::class)
|
||||||
|
@Config(manifest = Config.NONE)
|
||||||
|
class CsvWriterTest {
|
||||||
|
|
||||||
|
private lateinit var csvWriter: CsvWriter
|
||||||
|
private lateinit var context: Context
|
||||||
|
|
||||||
|
@Before
|
||||||
|
fun setUp() {
|
||||||
|
context = androidx.test.core.app.ApplicationProvider.getApplicationContext()
|
||||||
|
csvWriter = CsvWriter(context)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun writeCsv_Success() {
|
||||||
|
// Arrange
|
||||||
|
val fileName = "test.csv"
|
||||||
|
val data = listOf(
|
||||||
|
arrayOf("1", "A", "1990", "Positive", "2024-02-04", "image_url1", "John Doe"),
|
||||||
|
arrayOf("2", "B", "1985", "Negative", "2024-02-05", "image_url2", "Jane Doe")
|
||||||
|
)
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = csvWriter.writeCsv(fileName, data)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
Assert.assertTrue(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Test
|
||||||
|
// fun writeCsv_Failure() {
|
||||||
|
// // Arrange
|
||||||
|
// val fileName = "test.csv"
|
||||||
|
// val data = listOf(
|
||||||
|
// arrayOf("1", "A", "1990", "Positive", "2024-02-04", "image_url1", "John Doe"),
|
||||||
|
// arrayOf("2", "B", "1985", "Negative", "2024-02-05", "image_url2", "Jane Doe")
|
||||||
|
// )
|
||||||
|
//
|
||||||
|
// // Mocking Environment.getExternalStorageDirectory()
|
||||||
|
// val mockFile = Mockito.mock(File::class.java)
|
||||||
|
// Mockito.`when`(Environment.getExternalStorageDirectory()).thenReturn(mockFile)
|
||||||
|
// Mockito.`when`(mockFile.exists()).thenReturn(true)
|
||||||
|
//
|
||||||
|
// // Mocking FileWriter to simulate IOException
|
||||||
|
// val mockWriter = Mockito.mock(FileWriter::class.java)
|
||||||
|
// Mockito.`when`(mockWriter.write(Mockito.anyString())).thenThrow(IOException::class.java)
|
||||||
|
// Mockito.`when`(mockFile.absolutePath).thenReturn("/fake/path/to/file.csv")
|
||||||
|
// Mockito.`when`(FileWriter(mockFile)).thenReturn(mockWriter)
|
||||||
|
//
|
||||||
|
// // Act
|
||||||
|
// val result = csvWriter.writeCsv(fileName, data)
|
||||||
|
//
|
||||||
|
// // Assert
|
||||||
|
// Assert.assertFalse("Expected writeCsv to fail", result)
|
||||||
|
// }
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package com.example.hpostesting
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
|
||||||
|
import com.example.hpostesting.data.dao.HemoCubeDao
|
||||||
|
import com.example.hpostesting.data.repository.Repository
|
||||||
|
import com.example.hpostesting.presentation.deviceinfo.DeviceViewModel
|
||||||
|
import org.junit.Before
|
||||||
|
import org.junit.Rule
|
||||||
|
import org.junit.Test
|
||||||
|
import org.junit.runner.RunWith
|
||||||
|
import org.mockito.Mock
|
||||||
|
import org.mockito.junit.MockitoJUnitRunner
|
||||||
|
|
||||||
|
@RunWith(MockitoJUnitRunner::class)
|
||||||
|
class DeviceViewModelTest {
|
||||||
|
|
||||||
|
@get:Rule
|
||||||
|
val rule = InstantTaskExecutorRule()
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private lateinit var hemoCubeDao: HemoCubeDao
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private lateinit var repository: Repository
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private lateinit var context: Context
|
||||||
|
|
||||||
|
private lateinit var viewModel: DeviceViewModel
|
||||||
|
|
||||||
|
@Before
|
||||||
|
fun setup() {
|
||||||
|
viewModel = DeviceViewModel(hemoCubeDao, repository)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `test initial state`() {
|
||||||
|
assert(!viewModel.isServiceConnected)
|
||||||
|
assert(!viewModel.progressBar.value!!)
|
||||||
|
assert(viewModel.messages.value == null)
|
||||||
|
// assert(viewModel.allUserData == hemoCubeDao.getAll())
|
||||||
|
// assert(viewModel.deviceData.value == null)
|
||||||
|
// assert(viewModel.networkStatusLiveData.value == false)
|
||||||
|
assert(viewModel.fireBaseUpload.value == null)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add more tests for other functions and interactions as needed
|
||||||
|
}
|
||||||
@@ -318,21 +318,21 @@ class HemoCubeFragmentTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testDeviceRatioClassificationNormal() {
|
fun testDeviceRatioClassificationNormal() {
|
||||||
val ratio = 0.25
|
val ratio = 0.22
|
||||||
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
||||||
assertEquals("Normal", result)
|
assertEquals("Normal", result)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testDeviceRatioClassificationNegativeBorderline() {
|
fun testDeviceRatioClassificationNegativeBorderline() {
|
||||||
val ratio = 0.31
|
val ratio = 0.235
|
||||||
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
||||||
assertEquals("Negative Borderline, Repeat Test", result)
|
assertEquals("Negative Borderline", result)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testDeviceRatioClassificationSickleCellTrait() {
|
fun testDeviceRatioClassificationSickleCellTrait() {
|
||||||
val ratio = 0.34
|
val ratio = 0.25
|
||||||
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
||||||
assertEquals("Sickle Cell Trait", result)
|
assertEquals("Sickle Cell Trait", result)
|
||||||
}
|
}
|
||||||
@@ -357,4 +357,46 @@ class HemoCubeFragmentTest {
|
|||||||
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
||||||
assertEquals("Invalid", result)
|
assertEquals("Invalid", result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun findResultWithAdditionalMethods_ValidInput_ReturnsNegativeBorderlineRepeatTest() {
|
||||||
|
// `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 70.0)).thenReturn("Negative Borderline, Repeat Test")
|
||||||
|
val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 70.0)
|
||||||
|
assertEquals("Negative Borderline, Repeat Test", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun findResultWithAdditionalMethods_NormalDeviceRatio_ReturnsNormalBelowSlopeRatioThreshold() {
|
||||||
|
// `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 70.0)).thenReturn("Negative Borderline, Repeat Test")
|
||||||
|
val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 30.0)
|
||||||
|
assertEquals("Normal", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun findResultWithAdditionalMethods_NBL_ReturnsNBL() {
|
||||||
|
// `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Abnormal", 70.0)).thenReturn("Invalid")
|
||||||
|
val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline, Repeat Test", 70.0)
|
||||||
|
assertEquals("Negative Borderline, Repeat Test", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun findResultWithAdditionalMethods_SCT_ReturnsSCT() {
|
||||||
|
// `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Abnormal", 70.0)).thenReturn("Invalid")
|
||||||
|
val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Sickle Cell Trait", 70.0)
|
||||||
|
assertEquals("Sickle Cell Trait", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun findResultWithAdditionalMethods_PBL_ReturnsPBL() {
|
||||||
|
// `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Abnormal", 70.0)).thenReturn("Invalid")
|
||||||
|
val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Positive for Sickle Cell. HPLC for Confirmation", 70.0)
|
||||||
|
assertEquals("Positive for Sickle Cell. HPLC for Confirmation", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun findResultWithAdditionalMethods_SCD_ReturnsSCD() {
|
||||||
|
// `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Abnormal", 70.0)).thenReturn("Invalid")
|
||||||
|
val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Sickle Cell Disease", 70.0)
|
||||||
|
assertEquals("Sickle Cell Disease", result)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
package com.example.hpostesting
|
||||||
|
|
||||||
|
//
|
||||||
|
//class LogFileManagerImplTest {
|
||||||
|
//
|
||||||
|
// @Mock
|
||||||
|
// private lateinit var mockContext: Context
|
||||||
|
//
|
||||||
|
// private lateinit var logFileManager: LogFileManagerImpl
|
||||||
|
//
|
||||||
|
// @Before
|
||||||
|
// fun setUp() {
|
||||||
|
// mockContext = mock()
|
||||||
|
// logFileManager = LogFileManagerImpl(mockContext)
|
||||||
|
// }
|
||||||
|
|
||||||
|
// @Test
|
||||||
|
// fun testCreateLogFileSuccess() {
|
||||||
|
// // Mock filesDir
|
||||||
|
// whenever(mockContext.getString(R.string.app_name)).thenReturn("MockedAppName")
|
||||||
|
// val mockFilesDir = mock<File>()
|
||||||
|
// doReturn(true).whenever(mockContext).getFilesDir().exists()
|
||||||
|
// doReturn(mockFilesDir).whenever(mockContext).getFilesDir()
|
||||||
|
//
|
||||||
|
// // Set expected file name
|
||||||
|
// val expectedFileName = "hpos_1234567890.log"
|
||||||
|
// val currentTime = System.currentTimeMillis() / 1000L
|
||||||
|
// doReturn(true).whenever(mockFilesDir).createNewFile(expectedFileName)
|
||||||
|
// doReturn(mockFilesDir.absolutePath + File.separator + expectedFileName).whenever(mockFilesDir).absolutePath
|
||||||
|
//
|
||||||
|
// // Mock FileOutputStream
|
||||||
|
// val mockFileOutputStream = mock<FileOutputStream>()
|
||||||
|
// doReturn(mockFileOutputStream).whenever(FileOutputStream(mockFilesDir.absolutePath + File.separator + expectedFileName))
|
||||||
|
//
|
||||||
|
// // Call createLogFile and verify result
|
||||||
|
// val logFile = logFileManager.createLogFile()
|
||||||
|
//
|
||||||
|
// assertNotNull(logFile)
|
||||||
|
// assertTrue(logFile.exists())
|
||||||
|
// assertEquals(expectedFileName, logFile.name)
|
||||||
|
//
|
||||||
|
// // Verify FileOutputStream was called
|
||||||
|
// verify(mockFileOutputStream).write(any())
|
||||||
|
// verify(mockFileOutputStream).close()
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// @Test
|
||||||
|
// fun testCreateLogFileExistingFile() throws IOException {
|
||||||
|
// // Mock filesDir with existing file
|
||||||
|
// val mockFilesDir = mock<File>()
|
||||||
|
// val existingFile = mock<File>()
|
||||||
|
// doReturn(true).whenever(mockContext).getFilesDir().exists()
|
||||||
|
// doReturn(mockFilesDir).whenever(mockContext).getFilesDir()
|
||||||
|
// doReturn(true).whenever(mockFilesDir).exists()
|
||||||
|
// doReturn(listOf(existingFile)).whenever(mockFilesDir).listFiles()
|
||||||
|
//
|
||||||
|
// // Call createLogFile and expect exception
|
||||||
|
// try {
|
||||||
|
// logFileManager.createLogFile()
|
||||||
|
// fail("Expected IOException due to existing file")
|
||||||
|
// } catch (e: IOException) {
|
||||||
|
// // Expected behavior
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // Verify FileOutputStream was not called
|
||||||
|
// verify(mockFilesDir, times(0)).createNewFile(anyString())
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// @Test
|
||||||
|
// fun testCreateLogFileIOException() throws IOException {
|
||||||
|
// // Mock filesDir and IOException
|
||||||
|
// val mockFilesDir = mock<File>()
|
||||||
|
// doReturn(true).whenever(mockContext).getFilesDir().exists()
|
||||||
|
// doReturn(mockFilesDir).whenever(mockContext).getFilesDir()
|
||||||
|
// doReturn(true).whenever(mockFilesDir).exists()
|
||||||
|
// doThrow(IOException("Mock IOException")).whenever(mockFilesDir).createNewFile(anyString())
|
||||||
|
//
|
||||||
|
// // Call createLogFile and expect null result
|
||||||
|
// val logFile = logFileManager.createLogFile()
|
||||||
|
//
|
||||||
|
// assertNull(logFile)
|
||||||
|
//
|
||||||
|
// // Verify FileOutputStream was not called
|
||||||
|
// verify(mockFilesDir, times(0)).createNewFile(anyString())
|
||||||
|
// }
|
||||||
|
//}
|
||||||
@@ -0,0 +1,350 @@
|
|||||||
|
package com.example.hpostesting
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.SharedPreferences
|
||||||
|
import com.example.hpostesting.presentation.trueheme.TrueHemeFragment
|
||||||
|
import junit.framework.TestCase
|
||||||
|
import org.junit.Before
|
||||||
|
import org.junit.Test
|
||||||
|
import org.mockito.ArgumentMatchers
|
||||||
|
import org.mockito.Mock
|
||||||
|
import org.mockito.Mockito
|
||||||
|
import org.mockito.MockitoAnnotations
|
||||||
|
|
||||||
|
class TrueHemeFragmentTest {
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
lateinit var mockContext: Context
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private lateinit var mockSharedPreferences: SharedPreferences
|
||||||
|
|
||||||
|
private lateinit var fragment: TrueHemeFragment
|
||||||
|
|
||||||
|
@Before
|
||||||
|
fun setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this)
|
||||||
|
fragment = TrueHemeFragment()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV2HardwareId to get device id`() {
|
||||||
|
// Arrange
|
||||||
|
Mockito.`when`(
|
||||||
|
mockSharedPreferences.getString(
|
||||||
|
ArgumentMatchers.anyString(),
|
||||||
|
ArgumentMatchers.anyString()
|
||||||
|
)
|
||||||
|
).thenReturn("dummy_value")
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val deviceId = fragment.extractV2HardwareId("SNS HPP1-9000 SNE")
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertEquals("HPP1-9000", deviceId)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `updateDeviceId in shared pref`() {
|
||||||
|
// Arrange
|
||||||
|
Mockito.`when`(
|
||||||
|
mockSharedPreferences.getString(
|
||||||
|
ArgumentMatchers.anyString(),
|
||||||
|
ArgumentMatchers.anyString()
|
||||||
|
)
|
||||||
|
).thenReturn("HPP1-0001")
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val deviceId = mockSharedPreferences.getString(
|
||||||
|
ArgumentMatchers.anyString(),
|
||||||
|
ArgumentMatchers.anyString()
|
||||||
|
)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertEquals("HPP1-0001", deviceId)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `allReadingsComplete check`() {
|
||||||
|
// Arrange
|
||||||
|
val repeatReadingCount = 1
|
||||||
|
val readingsPerSample = 1
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.allReadingsComplete(repeatReadingCount, readingsPerSample)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertEquals(true, result)
|
||||||
|
TestCase.assertEquals(fragment.allReadingsComplete(0, 1), false)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV1HardwareId should return hardware ID when input contains SN`() {
|
||||||
|
// Arrange
|
||||||
|
val input = "Some text SN ABC123 some more text"
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.extractV1HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertEquals("ABC123", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV1HardwareId should return null when input does not contain SN`() {
|
||||||
|
// Arrange
|
||||||
|
val input = "Some text without SN"
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.extractV1HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertNull(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV1HardwareId should return null when input is empty`() {
|
||||||
|
// Arrange
|
||||||
|
val input = ""
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.extractV1HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertNull(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV1HardwareId should return null when input is null`() {
|
||||||
|
// Arrange
|
||||||
|
val input: String? = null
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = input?.let { fragment.extractV1HardwareId(it) }
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertNull(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV1HardwareId should return hardware ID when input contains SN in a specific format`() {
|
||||||
|
// Arrange
|
||||||
|
val input = """
|
||||||
|
SN HCV-000-3001
|
||||||
|
#BS
|
||||||
|
#BC
|
||||||
|
#SS
|
||||||
|
#SC
|
||||||
|
RESULT
|
||||||
|
LB1 20636.32
|
||||||
|
LB2 15855.67
|
||||||
|
LB3 21801.36
|
||||||
|
LB4 18362.33
|
||||||
|
LS1 17287
|
||||||
|
LS2 14855.67
|
||||||
|
LS3 15282.31
|
||||||
|
LS4 9737.98
|
||||||
|
REND
|
||||||
|
""".trimIndent()
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.extractV1HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertEquals("HCV-000-3001", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV2HardwareId should return the correct hardware ID when it exists in the input`() {
|
||||||
|
// Arrange
|
||||||
|
val input = "SNS ABC123 SNE"
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertEquals("ABC123", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV2HardwareId should return null when no hardware ID is found in the input`() {
|
||||||
|
// Arrange
|
||||||
|
val input = "No hardware ID in this input"
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertNull(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV2HardwareId should handle whitespace around the hardware ID`() {
|
||||||
|
// Arrange
|
||||||
|
val input = "SNS XYZ789 SNE"
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertEquals("XYZ789", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV2HardwareId should handle provided input string with HCV-000-3013`() {
|
||||||
|
// Arrange
|
||||||
|
val input = "SNS HCV-000-3013 SNE\n" +
|
||||||
|
"#SS1\n" +
|
||||||
|
"#SC1\n" +
|
||||||
|
"RESULT \n" +
|
||||||
|
"LB1 23411.00\n" +
|
||||||
|
"LB2 21417.00\n" +
|
||||||
|
"LB3 23869.00\n" +
|
||||||
|
"LB4 24967.00\n" +
|
||||||
|
"LS1 3401.00\n" +
|
||||||
|
"LS2 1107.00\n" +
|
||||||
|
"LS3 14410.00\n" +
|
||||||
|
"LS4 15047.00\n" +
|
||||||
|
"REND\n"
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertEquals("HCV-000-3013", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV2HardwareId should handle provided input string with HPP1-4001`() {
|
||||||
|
// Arrange
|
||||||
|
val input = "SNS HPP1-4001 SNE#SS1\n" +
|
||||||
|
"#SC1\n" +
|
||||||
|
"RESULT\n" +
|
||||||
|
"LB1 23777\n" +
|
||||||
|
"LB2 24130\n" +
|
||||||
|
"LB3 23442\n" +
|
||||||
|
"LB4 23945\n" +
|
||||||
|
"LS1 2521\n" +
|
||||||
|
"LS2 973\n" +
|
||||||
|
"LS3 10252\n" +
|
||||||
|
"LS4 11017\n" +
|
||||||
|
"REND\n"
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertEquals("HPP1-4001", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV2HardwareId should handle provided input string with HPP1-000-4001`() {
|
||||||
|
// Arrange
|
||||||
|
val input = "SNS HPP1-000-4001 SNE#SS1\n" +
|
||||||
|
"#SC1\n" +
|
||||||
|
"RESULT\n" +
|
||||||
|
"LB1 23777\n" +
|
||||||
|
"LB2 24130\n" +
|
||||||
|
"LB3 23442\n" +
|
||||||
|
"LB4 23945\n" +
|
||||||
|
"LS1 2521\n" +
|
||||||
|
"LS2 973\n" +
|
||||||
|
"LS3 10252\n" +
|
||||||
|
"LS4 11017\n" +
|
||||||
|
"REND\n"
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertEquals("HPP1-000-4001", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV2HardwareId should handle provided input string with HPP-000-4001`() {
|
||||||
|
// Arrange
|
||||||
|
val input = "SNS HPP-000-4001 SNE#SS1\n" +
|
||||||
|
"#SC1\n" +
|
||||||
|
"RESULT\n" +
|
||||||
|
"LB1 23777\n" +
|
||||||
|
"LB2 24130\n" +
|
||||||
|
"LB3 23442\n" +
|
||||||
|
"LB4 23945\n" +
|
||||||
|
"LS1 2521\n" +
|
||||||
|
"LS2 973\n" +
|
||||||
|
"LS3 10252\n" +
|
||||||
|
"LS4 11017\n" +
|
||||||
|
"REND\n"
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertEquals("HPP-000-4001", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV2HardwareId should handle provided input string with HPP-000-5001`() {
|
||||||
|
// Arrange
|
||||||
|
val input = "SNS HPP-000-5001 SNE#SS1\n" +
|
||||||
|
"#SC1\n" +
|
||||||
|
"RESULT\n" +
|
||||||
|
"LB1 23777\n" +
|
||||||
|
"LB2 24130\n" +
|
||||||
|
"LB3 23442\n" +
|
||||||
|
"LB4 23945\n" +
|
||||||
|
"LS1 2521\n" +
|
||||||
|
"LS2 973\n" +
|
||||||
|
"LS3 10252\n" +
|
||||||
|
"LS4 11017\n" +
|
||||||
|
"REND\n"
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = fragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
TestCase.assertEquals("HPP-000-5001", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeviceRatioClassificationNormal() {
|
||||||
|
val ratio = 0.25
|
||||||
|
val result = fragment.deviceRatioClassification(ratio)
|
||||||
|
TestCase.assertEquals("Normal", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeviceRatioClassificationNegativeBorderline() {
|
||||||
|
val ratio = 0.31
|
||||||
|
val result = fragment.deviceRatioClassification(ratio)
|
||||||
|
TestCase.assertEquals("Negative Borderline, Repeat Test", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeviceRatioClassificationSickleCellTrait() {
|
||||||
|
val ratio = 0.34
|
||||||
|
val result = fragment.deviceRatioClassification(ratio)
|
||||||
|
TestCase.assertEquals("Sickle Cell Trait", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeviceRatioClassificationPositiveForSickleCell() {
|
||||||
|
val ratio = 0.37
|
||||||
|
val result = fragment.deviceRatioClassification(ratio)
|
||||||
|
TestCase.assertEquals("Positive for Sickle Cell. HPLC for Confirmation", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeviceRatioClassificationSickleCellDisease() {
|
||||||
|
val ratio = 0.45
|
||||||
|
val result = fragment.deviceRatioClassification(ratio)
|
||||||
|
TestCase.assertEquals("Sickle Cell Disease", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeviceRatioClassificationInvalid() {
|
||||||
|
val ratio: Double? = null
|
||||||
|
val result = fragment.deviceRatioClassification(ratio)
|
||||||
|
TestCase.assertEquals("Invalid", result)
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user