Compare commits
26 Commits
qa
...
API-CALLS-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cf2e904445 | ||
|
|
205c7f1f53 | ||
|
|
468cacfbe5 | ||
|
|
a4bdfa1c71 | ||
|
|
985c484b8f | ||
|
|
9f2b53c7f7 | ||
|
|
0ac384a7b5 | ||
|
|
feac2dc75b | ||
|
|
4958af6fd9 | ||
|
|
69e129cddb | ||
|
|
2460c58bea | ||
|
|
63331c2253 | ||
|
|
3c4a1fa56b | ||
|
|
bddebfaf2e | ||
|
|
1871f8c77a | ||
|
|
06d62506a9 | ||
|
|
0b13e02ece | ||
|
|
d1733a817f | ||
|
|
14bf1bab1f | ||
|
|
97ec931814 | ||
|
|
126aeaed5d | ||
|
|
bce12a4fca | ||
|
|
2c21a29d22 | ||
|
|
012efd9904 | ||
|
|
f83823a15f | ||
|
|
a0fc7f7be4 |
@@ -86,3 +86,16 @@ debugTests:
|
|||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- ./gradlew -Pci --console=plain :app:testDebug
|
- ./gradlew -Pci --console=plain :app:testDebug
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- app/build/test-results/
|
||||||
|
|
||||||
|
publishTestResults:
|
||||||
|
stage: test
|
||||||
|
script:
|
||||||
|
- echo "Publishing JUnit test results"
|
||||||
|
needs: [debugTests]
|
||||||
|
artifacts:
|
||||||
|
when: always
|
||||||
|
reports:
|
||||||
|
junit: app/build/test-results/testDebugUnitTest/*.xml
|
||||||
|
|||||||
@@ -16,15 +16,16 @@ android {
|
|||||||
|
|
||||||
// prod - production, preprod - preproduction, quality - qc, dev - development
|
// prod - production, preprod - preproduction, quality - qc, dev - development
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "in.sminnovations.hpostesting.dev"
|
applicationId "in.sminnovations.hpostesting.quality"
|
||||||
minSdk 21
|
minSdk 21
|
||||||
targetSdk 34
|
targetSdk 34
|
||||||
versionCode 91
|
versionCode 100
|
||||||
versionName "2.1.91"
|
versionName "2.1.100"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
minifyEnabled false
|
||||||
@@ -80,7 +81,7 @@ dependencies {
|
|||||||
implementation 'com.google.firebase:firebase-storage-ktx'
|
implementation 'com.google.firebase:firebase-storage-ktx'
|
||||||
implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
|
implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
|
||||||
implementation 'com.google.android.gms:play-services-auth:20.7.0'
|
implementation 'com.google.android.gms:play-services-auth:20.7.0'
|
||||||
implementation 'com.google.android.gms:play-services-location:21.0.1'
|
implementation 'com.google.android.gms:play-services-location:21.1.0'
|
||||||
implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
|
implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
|
||||||
implementation 'com.google.android.things:androidthings:1.0'
|
implementation 'com.google.android.things:androidthings:1.0'
|
||||||
implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta11'
|
implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta11'
|
||||||
@@ -95,6 +96,8 @@ dependencies {
|
|||||||
// Testing
|
// Testing
|
||||||
testImplementation 'junit:junit:4.13.2'
|
testImplementation 'junit:junit:4.13.2'
|
||||||
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
|
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
|
||||||
|
androidTestImplementation 'com.android.support.test:runner:1.0.2'
|
||||||
|
androidTestImplementation 'com.android.support.test:rules:1.0.2'
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
|
||||||
testImplementation "androidx.work:work-testing:2.9.0"
|
testImplementation "androidx.work:work-testing:2.9.0"
|
||||||
androidTestImplementation 'androidx.test:core-ktx:1.5.0'
|
androidTestImplementation 'androidx.test:core-ktx:1.5.0'
|
||||||
@@ -108,10 +111,11 @@ dependencies {
|
|||||||
testImplementation 'org.mockito:mockito-core:3.12.4'
|
testImplementation 'org.mockito:mockito-core:3.12.4'
|
||||||
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'
|
||||||
|
|
||||||
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'
|
||||||
|
|
||||||
|
|
||||||
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
|
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
|
||||||
implementation 'com.opencsv:opencsv:5.9'
|
implementation 'com.opencsv:opencsv:5.9'
|
||||||
implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'
|
implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'
|
||||||
@@ -158,4 +162,5 @@ dependencies {
|
|||||||
// implementation("io.nats:jnats:2.11.2")
|
// implementation("io.nats:jnats:2.11.2")
|
||||||
implementation 'com.google.android.play:core:1.10.3'
|
implementation 'com.google.android.play:core:1.10.3'
|
||||||
|
|
||||||
|
implementation fileTree(dir: 'libs', include: ['*.aar'])
|
||||||
}
|
}
|
||||||
@@ -1,179 +1,48 @@
|
|||||||
{
|
{
|
||||||
"project_info": {
|
"project_info": {
|
||||||
"project_number": "650071678820",
|
"project_number": "1004619739289",
|
||||||
"project_id": "hpos-af3cc",
|
"project_id": "hpos-qa",
|
||||||
"storage_bucket": "hpos-af3cc.appspot.com"
|
"storage_bucket": "hpos-qa.appspot.com"
|
||||||
},
|
},
|
||||||
"client": [
|
"client": [
|
||||||
{
|
{
|
||||||
"client_info": {
|
"client_info": {
|
||||||
"mobilesdk_app_id": "1:650071678820:android:f1435a1c07f710036c6471",
|
"mobilesdk_app_id": "1:1004619739289:android:f669b47552748433e5c808",
|
||||||
"android_client_info": {
|
"android_client_info": {
|
||||||
"package_name": "com.example.hposconsentform"
|
"package_name": "in.sminnovations.hposregistration.quality"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"oauth_client": [
|
"oauth_client": [],
|
||||||
{
|
|
||||||
"client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
|
|
||||||
"client_type": 3
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"api_key": [
|
"api_key": [
|
||||||
{
|
{
|
||||||
"current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
|
"current_key": "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"services": {
|
"services": {
|
||||||
"appinvite_service": {
|
"appinvite_service": {
|
||||||
"other_platform_oauth_client": [
|
"other_platform_oauth_client": []
|
||||||
{
|
|
||||||
"client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
|
|
||||||
"client_type": 3
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"client_info": {
|
"client_info": {
|
||||||
"mobilesdk_app_id": "1:650071678820:android:2925e9ce3417d2386c6471",
|
"mobilesdk_app_id": "1:1004619739289:android:8397cd1f0357bd89e5c808",
|
||||||
"android_client_info": {
|
"android_client_info": {
|
||||||
"package_name": "in.sminnovations.hemocube"
|
"package_name": "in.sminnovations.hpostesting.quality"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"oauth_client": [
|
"oauth_client": [],
|
||||||
{
|
|
||||||
"client_id": "650071678820-srhm9spm9hjn4frcd3r6o02gdhdbtd15.apps.googleusercontent.com",
|
|
||||||
"client_type": 1,
|
|
||||||
"android_info": {
|
|
||||||
"package_name": "in.sminnovations.hemocube",
|
|
||||||
"certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
|
|
||||||
"client_type": 3
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"api_key": [
|
"api_key": [
|
||||||
{
|
{
|
||||||
"current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
|
"current_key": "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"services": {
|
"services": {
|
||||||
"appinvite_service": {
|
"appinvite_service": {
|
||||||
"other_platform_oauth_client": [
|
"other_platform_oauth_client": []
|
||||||
{
|
|
||||||
"client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
|
|
||||||
"client_type": 3
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"client_info": {
|
|
||||||
"mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471",
|
|
||||||
"android_client_info": {
|
|
||||||
"package_name": "in.sminnovations.hposregistration"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"oauth_client": [
|
|
||||||
{
|
|
||||||
"client_id": "650071678820-70kp5jvjda4r5diqch2kn4lc40p4f42g.apps.googleusercontent.com",
|
|
||||||
"client_type": 1,
|
|
||||||
"android_info": {
|
|
||||||
"package_name": "in.sminnovations.hposregistration",
|
|
||||||
"certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
|
|
||||||
"client_type": 3
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"api_key": [
|
|
||||||
{
|
|
||||||
"current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"services": {
|
|
||||||
"appinvite_service": {
|
|
||||||
"other_platform_oauth_client": [
|
|
||||||
{
|
|
||||||
"client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
|
|
||||||
"client_type": 3
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"client_info": {
|
|
||||||
"mobilesdk_app_id": "1:650071678820:android:f96be19e5d43102b6c6471",
|
|
||||||
"android_client_info": {
|
|
||||||
"package_name": "in.sminnovations.hpostesting"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"oauth_client": [
|
|
||||||
{
|
|
||||||
"client_id": "650071678820-l87dnr0bdj95get0khgnvfv2an1k6ogq.apps.googleusercontent.com",
|
|
||||||
"client_type": 1,
|
|
||||||
"android_info": {
|
|
||||||
"package_name": "in.sminnovations.hpostesting",
|
|
||||||
"certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
|
|
||||||
"client_type": 3
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"api_key": [
|
|
||||||
{
|
|
||||||
"current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"services": {
|
|
||||||
"appinvite_service": {
|
|
||||||
"other_platform_oauth_client": [
|
|
||||||
{
|
|
||||||
"client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
|
|
||||||
"client_type": 3
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"client_info": {
|
|
||||||
"mobilesdk_app_id": "1:650071678820:android:a53292637abb7c0d6c6471",
|
|
||||||
"android_client_info": {
|
|
||||||
"package_name": "in.sminnovations.hpostesting.dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"oauth_client": [
|
|
||||||
{
|
|
||||||
"client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
|
|
||||||
"client_type": 3
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"api_key": [
|
|
||||||
{
|
|
||||||
"current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"services": {
|
|
||||||
"appinvite_service": {
|
|
||||||
"other_platform_oauth_client": [
|
|
||||||
{
|
|
||||||
"client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
|
|
||||||
"client_type": 3
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"configuration_version": "1"
|
"configuration_version": "1"
|
||||||
}
|
}
|
||||||
BIN
app/libs/barcode_scanner_library_v2.6.19.0-release.aar
Executable file
BIN
app/libs/barcode_scanner_library_v2.6.19.0-release.aar
Executable file
Binary file not shown.
@@ -69,6 +69,15 @@
|
|||||||
android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
|
android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
|
||||||
android:theme="@style/Theme.HPOS.NoActionBar"
|
android:theme="@style/Theme.HPOS.NoActionBar"
|
||||||
android:windowSoftInputMode="adjustPan" />
|
android:windowSoftInputMode="adjustPan" />
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name="com.example.hpostesting.presentation.trueheme.TrueHemeActivity"
|
||||||
|
android:exported="false"
|
||||||
|
android:noHistory="true"
|
||||||
|
android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
|
||||||
|
android:theme="@style/Theme.HPOS.NoActionBar"
|
||||||
|
android:windowSoftInputMode="adjustPan" />
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name="com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity"
|
android:name="com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
|
|||||||
@@ -35,8 +35,9 @@ object Constants {
|
|||||||
const val MAX_WAVELENGTH_RANGE_TO_RECORD = 750
|
const val MAX_WAVELENGTH_RANGE_TO_RECORD = 750
|
||||||
|
|
||||||
const val DEVICE_PRODUCT_ID = 24597
|
const val DEVICE_PRODUCT_ID = 24597
|
||||||
const val DEVICE_TYPE_HOMOCUBE = "HOMOCUBE"
|
const val DEVICE_TYPE_HEMOCUBE = "HEMOCUBE"
|
||||||
const val DEVICE_TYPE_TEST_RIGHT = "TEST_RIGHT"
|
const val DEVICE_TYPE_TEST_RIGHT = "TEST_RIGHT"
|
||||||
|
const val DEVICE_TYPE_TRUEHEME = "TRUEHEME"
|
||||||
|
|
||||||
const val DEVICE_VENDOR_ID = 1027
|
const val DEVICE_VENDOR_ID = 1027
|
||||||
const val HOMO_CUBE_ID = 29987
|
const val HOMO_CUBE_ID = 29987
|
||||||
@@ -58,6 +59,8 @@ object Constants {
|
|||||||
const val QUICK_CAPTURE_VOLUME = "VOLUME"
|
const val QUICK_CAPTURE_VOLUME = "VOLUME"
|
||||||
const val QUICK_CAPTURE_READING_PER_SAMPLE = "READING_PER_SAMPLE"
|
const val QUICK_CAPTURE_READING_PER_SAMPLE = "READING_PER_SAMPLE"
|
||||||
|
|
||||||
|
const val BLANK_EVERY_TEST = false
|
||||||
|
|
||||||
val STATICID = listOf(
|
val STATICID = listOf(
|
||||||
"FACTORY",
|
"FACTORY",
|
||||||
"ADMIN",
|
"ADMIN",
|
||||||
@@ -177,7 +180,7 @@ object Constants {
|
|||||||
const val DEVICE_ID = "DEVICE_ID"
|
const val DEVICE_ID = "DEVICE_ID"
|
||||||
|
|
||||||
const val BUFFER_LED_LOWER_BOUND = 21000
|
const val BUFFER_LED_LOWER_BOUND = 21000
|
||||||
const val BUFFER_LED_UPPER_BOUND = 24500
|
const val BUFFER_LED_UPPER_BOUND = 23500
|
||||||
|
|
||||||
const val TEST_STATUS_CODE_TEST_STARTED = 1.0
|
const val TEST_STATUS_CODE_TEST_STARTED = 1.0
|
||||||
const val TEST_STATUS_CODE_CONFIG_STARTED = 2.0
|
const val TEST_STATUS_CODE_CONFIG_STARTED = 2.0
|
||||||
@@ -1175,64 +1178,64 @@ object Constants {
|
|||||||
|
|
||||||
val BUFFER_INTENSITY_THRESHOLDS: Map<String, List<List<Int>>> = mapOf<String, List<List<Int>>>(
|
val BUFFER_INTENSITY_THRESHOLDS: Map<String, List<List<Int>>> = mapOf<String, List<List<Int>>>(
|
||||||
"HCV-000-3001" to listOf(
|
"HCV-000-3001" to listOf(
|
||||||
listOf(20000, 25074),
|
listOf(23000, 25074),
|
||||||
listOf(20000, 24596),
|
listOf(23000, 24596),
|
||||||
listOf(20000, 26065),
|
listOf(23000, 26065),
|
||||||
listOf(20000, 27093),
|
listOf(23000, 27093),
|
||||||
),
|
),
|
||||||
"HCV-000-3002" to listOf(
|
"HCV-000-3002" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3003" to listOf(
|
"HCV-000-3003" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3004" to listOf(
|
"HCV-000-3004" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3005" to listOf(
|
"HCV-000-3005" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3006" to listOf(
|
"HCV-000-3006" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3007" to listOf(
|
"HCV-000-3007" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3008" to listOf(
|
"HCV-000-3008" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3009" to listOf(
|
"HCV-000-3009" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3010" to listOf(
|
"HCV-000-3010" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3011" to listOf(
|
"HCV-000-3011" to listOf(
|
||||||
listOf(20000, 25074),
|
listOf(20000, 25074),
|
||||||
@@ -1241,58 +1244,58 @@ object Constants {
|
|||||||
listOf(20000, 27093),
|
listOf(20000, 27093),
|
||||||
),
|
),
|
||||||
"HCV-000-3012" to listOf(
|
"HCV-000-3012" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-1015" to listOf(
|
"HCV-000-3013" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3014" to listOf(
|
"HCV-000-3014" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3015" to listOf(
|
"HCV-000-3015" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3016" to listOf(
|
"HCV-000-3016" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3017" to listOf(
|
"HCV-000-3017" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3018" to listOf(
|
"HCV-000-3018" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3019" to listOf(
|
"HCV-000-3019" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3020" to listOf(
|
"HCV-000-3020" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3021" to listOf(
|
"HCV-000-3021" to listOf(
|
||||||
listOf(20000, 25074),
|
listOf(20000, 25074),
|
||||||
@@ -1301,58 +1304,58 @@ object Constants {
|
|||||||
listOf(20000, 27093),
|
listOf(20000, 27093),
|
||||||
),
|
),
|
||||||
"HCV-000-3022" to listOf(
|
"HCV-000-3022" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3023" to listOf(
|
"HCV-000-3023" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3024" to listOf(
|
"HCV-000-3024" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3025" to listOf(
|
"HCV-000-3025" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3026" to listOf(
|
"HCV-000-3026" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3027" to listOf(
|
"HCV-000-3027" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3028" to listOf(
|
"HCV-000-3028" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3029" to listOf(
|
"HCV-000-3029" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HCV-000-3030" to listOf(
|
"HCV-000-3030" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0001" to listOf(
|
"HPP1-0124-0001" to listOf(
|
||||||
listOf(20000, 25074),
|
listOf(20000, 25074),
|
||||||
@@ -1361,58 +1364,58 @@ object Constants {
|
|||||||
listOf(20000, 27093),
|
listOf(20000, 27093),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0002" to listOf(
|
"HPP1-0124-0002" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0003" to listOf(
|
"HPP1-0124-0003" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0004" to listOf(
|
"HPP1-0124-0004" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0005" to listOf(
|
"HPP1-0124-0005" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0006" to listOf(
|
"HPP1-0124-0006" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0007" to listOf(
|
"HPP1-0124-0007" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0008" to listOf(
|
"HPP1-0124-0008" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0009" to listOf(
|
"HPP1-0124-0009" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0010" to listOf(
|
"HPP1-0124-0010" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0011" to listOf(
|
"HPP1-0124-0011" to listOf(
|
||||||
listOf(20000, 25074),
|
listOf(20000, 25074),
|
||||||
@@ -1421,118 +1424,118 @@ object Constants {
|
|||||||
listOf(20000, 27093),
|
listOf(20000, 27093),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0012" to listOf(
|
"HPP1-0124-0012" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0013" to listOf(
|
"HPP1-0124-0013" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0014" to listOf(
|
"HPP1-0124-0014" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0015" to listOf(
|
"HPP1-0124-0015" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0016" to listOf(
|
"HPP1-0124-0016" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0017" to listOf(
|
"HPP1-0124-0017" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0018" to listOf(
|
"HPP1-0124-0018" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0019" to listOf(
|
"HPP1-0124-0019" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0020" to listOf(
|
"HPP1-0124-0020" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0021" to listOf(
|
"HPP1-0124-0021" to listOf(
|
||||||
listOf(20000, 25074),
|
listOf(23500, 26250),
|
||||||
listOf(20000, 24596),
|
listOf(23500, 26250),
|
||||||
listOf(20000, 26065),
|
listOf(23500, 26250),
|
||||||
listOf(20000, 27093),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0022" to listOf(
|
"HPP1-0124-0022" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0023" to listOf(
|
"HPP1-0124-0023" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0024" to listOf(
|
"HPP1-0124-0024" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0025" to listOf(
|
"HPP1-0124-0025" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0026" to listOf(
|
"HPP1-0124-0026" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0027" to listOf(
|
"HPP1-0124-0027" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0028" to listOf(
|
"HPP1-0124-0028" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0029" to listOf(
|
"HPP1-0124-0029" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0030" to listOf(
|
"HPP1-0124-0030" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0031" to listOf(
|
"HPP1-0124-0031" to listOf(
|
||||||
listOf(20000, 25074),
|
listOf(20000, 25074),
|
||||||
@@ -1541,118 +1544,118 @@ object Constants {
|
|||||||
listOf(20000, 27093),
|
listOf(20000, 27093),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0032" to listOf(
|
"HPP1-0124-0032" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0033" to listOf(
|
"HPP1-0124-0033" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0034" to listOf(
|
"HPP1-0124-0034" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0035" to listOf(
|
"HPP1-0124-0035" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0036" to listOf(
|
"HPP1-0124-0036" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0037" to listOf(
|
"HPP1-0124-0037" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0038" to listOf(
|
"HPP1-0124-0038" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0039" to listOf(
|
"HPP1-0124-0039" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0040" to listOf(
|
"HPP1-0124-0040" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0041" to listOf(
|
"HPP1-0124-0040" to listOf(
|
||||||
listOf(20000, 25074),
|
listOf(23500, 26250),
|
||||||
listOf(20000, 24596),
|
listOf(23500, 26250),
|
||||||
listOf(20000, 26065),
|
listOf(23500, 26250),
|
||||||
listOf(20000, 27093),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0042" to listOf(
|
"HPP1-0124-0042" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0043" to listOf(
|
"HPP1-0124-0043" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0044" to listOf(
|
"HPP1-0124-0044" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0045" to listOf(
|
"HPP1-0124-0045" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0046" to listOf(
|
"HPP1-0124-0046" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0047" to listOf(
|
"HPP1-0124-0047" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0048" to listOf(
|
"HPP1-0124-0048" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0049" to listOf(
|
"HPP1-0124-0049" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
),
|
),
|
||||||
"HPP1-0124-0050" to listOf(
|
"HPP1-0124-0050" to listOf(
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
listOf(24500, 26250),
|
listOf(23500, 26250),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ enum class TestStatus(val code: Double) {
|
|||||||
TEST_STARTED(1.0),
|
TEST_STARTED(1.0),
|
||||||
CONFIG_STARTED(2.0),
|
CONFIG_STARTED(2.0),
|
||||||
CONFIG_COMPLETED(3.0),
|
CONFIG_COMPLETED(3.0),
|
||||||
|
FIRST_EMPTY_AIR_READING_STARTED(4.1),
|
||||||
|
FIRST_EMPTY_AIR_READING_COMPLETED(4.2),
|
||||||
|
FIRST_EMPTY_AIR_READING_PRINT_STARTED(4.3),
|
||||||
|
FIRST_EMPTY_AIR_READING_PRINT_COMPLETED(4.4),
|
||||||
BUFFER_STARTED(4.0),
|
BUFFER_STARTED(4.0),
|
||||||
BUFFER_COMPLETED(5.0),
|
BUFFER_COMPLETED(5.0),
|
||||||
BUFFER_PRINT_STARTED(6.0),
|
BUFFER_PRINT_STARTED(6.0),
|
||||||
@@ -12,6 +16,10 @@ enum class TestStatus(val code: Double) {
|
|||||||
SAMPLE_COMPLETED(9.0),
|
SAMPLE_COMPLETED(9.0),
|
||||||
SAMPLE_PRINT_STARTED(10.0),
|
SAMPLE_PRINT_STARTED(10.0),
|
||||||
SAMPLE_PRINT_COMPLETED(11.0),
|
SAMPLE_PRINT_COMPLETED(11.0),
|
||||||
|
SECOND_EMPTY_AIR_READING_STARTED(11.1),
|
||||||
|
SECOND_EMPTY_AIR_READING_COMPLETED(11.2),
|
||||||
|
SECOND_EMPTY_AIR_PRINT_STARTED(11.3),
|
||||||
|
SECOND_EMPTY_AIR_PRINT_COMPLETED(11.4),
|
||||||
FIRST_GAIN_STARTED(12.0),
|
FIRST_GAIN_STARTED(12.0),
|
||||||
FIRST_GAIN_COMPLETED(13.0),
|
FIRST_GAIN_COMPLETED(13.0),
|
||||||
FIRST_GAIN_PRINT_STARTED(14.0),
|
FIRST_GAIN_PRINT_STARTED(14.0),
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import com.example.hpostesting.data.model.patient.DeviceData
|
|||||||
import com.example.hpostesting.data.model.patient.HemoCubeTestData
|
import com.example.hpostesting.data.model.patient.HemoCubeTestData
|
||||||
import com.example.hpostesting.data.model.patient.UserData
|
import com.example.hpostesting.data.model.patient.UserData
|
||||||
|
|
||||||
@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], version = 23, exportSchema = false)
|
@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], version = 24, exportSchema = false)
|
||||||
@TypeConverters(Converters::class)
|
@TypeConverters(Converters::class)
|
||||||
abstract class MyDatabase : RoomDatabase() {
|
abstract class MyDatabase : RoomDatabase() {
|
||||||
abstract fun userDao(): UserDao
|
abstract fun userDao(): UserDao
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package com.example.hpostesting.data.model
|
||||||
|
|
||||||
|
import com.example.hpostesting.data.constant.Constants
|
||||||
|
import com.example.hpostesting.data.model.patient.DeviceData
|
||||||
|
import com.example.hpostesting.data.model.patient.HemoCubeTestData
|
||||||
|
|
||||||
|
data class TestState (
|
||||||
|
var testDetails: HemoCubeTestData? = null,
|
||||||
|
var isOnline: Boolean = false,
|
||||||
|
var currentDeviceData: DeviceData? = null,
|
||||||
|
var resultData: String = "",
|
||||||
|
var currentResultData: String = "",
|
||||||
|
var isUsingExistingBuffer: Boolean = false,
|
||||||
|
var isTestOngoing: Boolean = false,
|
||||||
|
var led1BufferForDevice: Double = 0.0,
|
||||||
|
var led2BufferForDevice: Double = 0.0,
|
||||||
|
var led3BufferForDevice: Double = 0.0,
|
||||||
|
var led4BufferForDevice: Double = 0.0,
|
||||||
|
var led1SampleForDevice: Double = 0.0,
|
||||||
|
var led2SampleForDevice: Double = 0.0,
|
||||||
|
var led3SampleForDevice: Double = 0.0,
|
||||||
|
var led4SampleForDevice: Double = 0.0,
|
||||||
|
var fittedAbs1: Double = 0.0,
|
||||||
|
var fittedAbs2: Double = 0.0,
|
||||||
|
var fittedAbs3: Double = 0.0,
|
||||||
|
var fittedAbs4: Double = 0.0,
|
||||||
|
// var led1Air1: Double? = null,
|
||||||
|
// var led2Air1: Double? = null,
|
||||||
|
// var led3Air1: Double? = null,
|
||||||
|
// var led4Air1: Double? = null,
|
||||||
|
// var led1Air2: Double? = null,
|
||||||
|
// var led2Air2: Double? = null,
|
||||||
|
// var led3Air2: Double? = null,
|
||||||
|
// var led4Air2: Double? = null,
|
||||||
|
var calculatedPredictedDenovixRatio: Double = 0.0,
|
||||||
|
var validationError: Boolean = false,
|
||||||
|
var deviceHardwareId: String = "",
|
||||||
|
var allErrorMessages: String = "",
|
||||||
|
var testStatusCode: Double = 0.0,
|
||||||
|
var repeatReadingCount: Int = 0,
|
||||||
|
var readingsPerSample: Int = Constants.READINGS_PER_SAMPLE,
|
||||||
|
var uploadedToCloud: Boolean = false,
|
||||||
|
var uploadedToMolbio: Boolean = false
|
||||||
|
)
|
||||||
@@ -61,6 +61,14 @@ data class HemoCubeTestData(
|
|||||||
var led2Gain4: Double? = null,
|
var led2Gain4: Double? = null,
|
||||||
var led3Gain4: Double? = null,
|
var led3Gain4: Double? = null,
|
||||||
var led4Gain4: Double? = null,
|
var led4Gain4: Double? = null,
|
||||||
|
var led1Air1: Double? = null,
|
||||||
|
var led2Air1: Double? = null,
|
||||||
|
var led3Air1: Double? = null,
|
||||||
|
var led4Air1: Double? = null,
|
||||||
|
var led1Air2: Double? = null,
|
||||||
|
var led2Air2: Double? = null,
|
||||||
|
var led3Air2: Double? = null,
|
||||||
|
var led4Air2: Double? = null,
|
||||||
var deviceRatio: Double? = null,
|
var deviceRatio: Double? = null,
|
||||||
var calculatedRatio: Double? = null,
|
var calculatedRatio: Double? = null,
|
||||||
var predictedDenovixRatio: Double? = null,
|
var predictedDenovixRatio: Double? = null,
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ class DatabaseRepository @Inject constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest): Result<DeviceProvisionResponse> {
|
override suspend fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest): Result<DeviceProvisionResponse> {
|
||||||
return safeApiCall { molbioAuthApi.deviceProvision(deviceProvisionRequest) }
|
return safeApiCall { molbioAuthApi.deviceProvision(deviceProvisionRequest) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ package com.example.hpostesting.data.repository
|
|||||||
|
|
||||||
import com.example.hpostesting.data.Result
|
import com.example.hpostesting.data.Result
|
||||||
import com.example.hpostesting.data.model.Response
|
import com.example.hpostesting.data.model.Response
|
||||||
|
import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
|
||||||
|
import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
|
||||||
import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
|
import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
|
||||||
import com.example.hpostesting.data.model.log.UploadLogsResponse
|
import com.example.hpostesting.data.model.log.UploadLogsResponse
|
||||||
import com.example.hpostesting.data.model.login.LoginRequest
|
import com.example.hpostesting.data.model.login.LoginRequest
|
||||||
@@ -33,6 +35,8 @@ interface Repository {
|
|||||||
abstract fun <UserData> addTestToDatabase(testDetails: UserData): Any
|
abstract fun <UserData> addTestToDatabase(testDetails: UserData): Any
|
||||||
// suspend fun addToDatabase(data: PatientDetails)
|
// suspend fun addToDatabase(data: PatientDetails)
|
||||||
|
|
||||||
|
suspend fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest): Result<DeviceProvisionResponse>
|
||||||
|
|
||||||
suspend fun login(loginRequest: LoginRequest): Result<LoginResponse>
|
suspend fun login(loginRequest: LoginRequest): Result<LoginResponse>
|
||||||
|
|
||||||
suspend fun uploadResults(molbioV2ResultRequest: MolbioV2ResultRequest): Result<MolbioV2ResultResponse>
|
suspend fun uploadResults(molbioV2ResultRequest: MolbioV2ResultRequest): Result<MolbioV2ResultResponse>
|
||||||
|
|||||||
@@ -1,18 +1,19 @@
|
|||||||
package com.example.hpostesting.presentation
|
package com.example.hpostesting.presentation
|
||||||
|
|
||||||
import com.example.hpostesting.presentation.dashboard.DashboardActivity
|
|
||||||
import android.content.Context
|
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.text.Editable
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
import android.widget.EditText
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
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.dashboard.DashboardActivity
|
||||||
import com.example.hpostesting.presentation.hemocube.HemocubeActivity
|
import com.example.hpostesting.presentation.hemocube.HemocubeActivity
|
||||||
import com.example.hpostesting.presentation.testRight.TestRightActivity
|
import com.example.hpostesting.presentation.testRight.TestRightActivity
|
||||||
import com.google.android.material.snackbar.Snackbar
|
import com.google.android.material.snackbar.Snackbar
|
||||||
@@ -20,16 +21,28 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
|
|||||||
import com.journeyapps.barcodescanner.ScanContract
|
import com.journeyapps.barcodescanner.ScanContract
|
||||||
import com.journeyapps.barcodescanner.ScanIntentResult
|
import com.journeyapps.barcodescanner.ScanIntentResult
|
||||||
import com.journeyapps.barcodescanner.ScanOptions
|
import com.journeyapps.barcodescanner.ScanOptions
|
||||||
|
import com.zebra.barcode.sdk.sms.ConfigurationUpdateEvent
|
||||||
|
import com.zebra.scannercontrol.DCSSDKDefs
|
||||||
|
import com.zebra.scannercontrol.DCSSDKDefs.DCSSDK_COMMAND_OPCODE
|
||||||
|
import com.zebra.scannercontrol.DCSSDKDefs.DCSSDK_RESULT
|
||||||
|
import com.zebra.scannercontrol.DCSScannerInfo
|
||||||
|
import com.zebra.scannercontrol.FirmwareUpdateEvent
|
||||||
|
import com.zebra.scannercontrol.IDcsSdkApiDelegate
|
||||||
|
import com.zebra.scannercontrol.SDKHandler
|
||||||
import `in`.sminnovations.hpostesting.R
|
import `in`.sminnovations.hpostesting.R
|
||||||
import `in`.sminnovations.hpostesting.databinding.ActivityKitScanBinding
|
import `in`.sminnovations.hpostesting.databinding.ActivityKitScanBinding
|
||||||
|
|
||||||
class KitScanActivity : AppCompatActivity() {
|
class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
|
||||||
|
|
||||||
private val TAG = "KitScanActivity"
|
private val TAG = "KitScanActivity"
|
||||||
private lateinit var binding: ActivityKitScanBinding
|
private lateinit var binding: ActivityKitScanBinding
|
||||||
|
|
||||||
private lateinit var sharedPreference: SharedPreferences
|
private lateinit var sharedPreference: SharedPreferences
|
||||||
|
|
||||||
|
var sdkHandler: SDKHandler? = null
|
||||||
|
var editBarcode: EditText? = null
|
||||||
|
var mScannerInfoList = ArrayList<DCSScannerInfo>()
|
||||||
|
|
||||||
private val barcodeLauncher = registerForActivityResult(
|
private val barcodeLauncher = registerForActivityResult(
|
||||||
ScanContract()
|
ScanContract()
|
||||||
) { result: ScanIntentResult ->
|
) { result: ScanIntentResult ->
|
||||||
@@ -51,6 +64,35 @@ class KitScanActivity : AppCompatActivity() {
|
|||||||
super.attachBaseContext(newBase)
|
super.attachBaseContext(newBase)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
override fun dcssdkEventScannerAppeared(dcsScannerInfo: DCSScannerInfo?) {}
|
||||||
|
|
||||||
|
override fun dcssdkEventScannerDisappeared(i: Int) {}
|
||||||
|
|
||||||
|
override fun dcssdkEventCommunicationSessionEstablished(dcsScannerInfo: DCSScannerInfo?) {}
|
||||||
|
|
||||||
|
override fun dcssdkEventCommunicationSessionTerminated(i: Int) {}
|
||||||
|
// override fun dcssdkEventBarcode(p0: ByteArray?, p1: Int, p2: Int) {
|
||||||
|
// TODO("Not yet implemented")
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
override fun dcssdkEventImage(bytes: ByteArray?, i: Int) {}
|
||||||
|
|
||||||
|
override fun dcssdkEventVideo(bytes: ByteArray?, i: Int) {}
|
||||||
|
|
||||||
|
override fun dcssdkEventBinaryData(bytes: ByteArray?, i: Int) {}
|
||||||
|
|
||||||
|
override fun dcssdkEventFirmwareUpdate(firmwareUpdateEvent: FirmwareUpdateEvent?) {}
|
||||||
|
|
||||||
|
override fun dcssdkEventAuxScannerAppeared(
|
||||||
|
dcsScannerInfo: DCSScannerInfo?,
|
||||||
|
dcsScannerInfo1: DCSScannerInfo?
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun dcssdkEventConfigurationUpdate(configurationUpdateEvent: ConfigurationUpdateEvent?) {}
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
@@ -110,7 +152,8 @@ class KitScanActivity : AppCompatActivity() {
|
|||||||
setSupportActionBar(binding.toolbar)
|
setSupportActionBar(binding.toolbar)
|
||||||
|
|
||||||
binding.btnScanNow.setOnClickListener {
|
binding.btnScanNow.setOnClickListener {
|
||||||
startScanningNow()
|
// startScanningNow()
|
||||||
|
pullTrigger()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -164,6 +207,84 @@ class KitScanActivity : AppCompatActivity() {
|
|||||||
Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
|
Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Setting up the SDK handler
|
||||||
|
|
||||||
|
//Setting up the SDK handler
|
||||||
|
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.
|
||||||
|
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
|
||||||
|
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
|
||||||
|
//first we use bitmapping to set these values into the notifications_mask.
|
||||||
|
var notifications_mask = 0
|
||||||
|
// We would like to subscribe to all barcode events
|
||||||
|
// We would like to subscribe to all barcode events
|
||||||
|
notifications_mask =
|
||||||
|
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)
|
||||||
|
|
||||||
|
|
||||||
|
//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())
|
||||||
|
|
||||||
|
//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()) {
|
||||||
|
sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
|
||||||
|
} else {
|
||||||
|
Toast.makeText(this, "No scanner is Available", Toast.LENGTH_LONG).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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.
|
||||||
|
override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) {
|
||||||
|
val result = String(barcodeData!!)
|
||||||
|
Log.d("BARCODE", result)
|
||||||
|
runOnUiThread {
|
||||||
|
val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
|
||||||
|
binding.nameEditText.text = editableResult
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun checkHemoCubeKitData(): Boolean {
|
private fun checkHemoCubeKitData(): Boolean {
|
||||||
@@ -185,7 +306,7 @@ class KitScanActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
DataHolder.deviceType.observe(this) { deviceType ->
|
DataHolder.deviceType.observe(this) { deviceType ->
|
||||||
when (deviceType) {
|
when (deviceType) {
|
||||||
Constants.DEVICE_TYPE_HOMOCUBE -> {
|
Constants.DEVICE_TYPE_HEMOCUBE -> {
|
||||||
val i = Intent(applicationContext, HemocubeActivity::class.java)
|
val i = Intent(applicationContext, HemocubeActivity::class.java)
|
||||||
startActivity(i)
|
startActivity(i)
|
||||||
}
|
}
|
||||||
@@ -194,6 +315,11 @@ class KitScanActivity : AppCompatActivity() {
|
|||||||
val i = Intent(applicationContext, TestRightActivity::class.java)
|
val i = Intent(applicationContext, TestRightActivity::class.java)
|
||||||
startActivity(i)
|
startActivity(i)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Constants.DEVICE_TYPE_TRUEHEME -> {
|
||||||
|
val i = Intent(applicationContext, HemocubeActivity::class.java)
|
||||||
|
startActivity(i)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
package com.example.hpostesting.presentation
|
package com.example.hpostesting.presentation
|
||||||
|
|
||||||
import com.example.hpostesting.presentation.dashboard.DashboardActivity
|
|
||||||
import android.Manifest
|
import android.Manifest
|
||||||
import android.content.*
|
import android.content.BroadcastReceiver
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.IntentFilter
|
||||||
import android.content.pm.PackageManager
|
import android.content.pm.PackageManager
|
||||||
import android.hardware.usb.UsbManager
|
import android.hardware.usb.UsbManager
|
||||||
import android.location.Location
|
import android.location.Location
|
||||||
@@ -20,7 +22,12 @@ 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.data.model.patient.UserData
|
import com.example.hpostesting.data.model.patient.UserData
|
||||||
import com.example.hpostesting.data.model.test.TestType
|
import com.example.hpostesting.data.model.test.TestType
|
||||||
import com.google.android.gms.location.*
|
import com.example.hpostesting.presentation.dashboard.DashboardActivity
|
||||||
|
import com.google.android.gms.location.FusedLocationProviderClient
|
||||||
|
import com.google.android.gms.location.LocationCallback
|
||||||
|
import com.google.android.gms.location.LocationRequest
|
||||||
|
import com.google.android.gms.location.LocationResult
|
||||||
|
import com.google.android.gms.location.LocationServices
|
||||||
import com.google.android.material.snackbar.Snackbar
|
import com.google.android.material.snackbar.Snackbar
|
||||||
import com.google.firebase.crashlytics.FirebaseCrashlytics
|
import com.google.firebase.crashlytics.FirebaseCrashlytics
|
||||||
import com.hoho.android.usbserial.driver.UsbSerialProber
|
import com.hoho.android.usbserial.driver.UsbSerialProber
|
||||||
@@ -81,7 +88,7 @@ class MainActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
DataHolder.deviceType.observe(this) { deviceType ->
|
DataHolder.deviceType.observe(this) { deviceType ->
|
||||||
with(binding) {
|
with(binding) {
|
||||||
if (deviceType == Constants.DEVICE_TYPE_HOMOCUBE) {
|
if (deviceType == Constants.DEVICE_TYPE_HEMOCUBE) {
|
||||||
cvItem1.visibility = View.VISIBLE
|
cvItem1.visibility = View.VISIBLE
|
||||||
cvItem3.visibility = View.VISIBLE
|
cvItem3.visibility = View.VISIBLE
|
||||||
cvItem2.visibility = View.GONE
|
cvItem2.visibility = View.GONE
|
||||||
@@ -111,8 +118,8 @@ class MainActivity : AppCompatActivity() {
|
|||||||
binding.cvItem3.visibility = View.VISIBLE
|
binding.cvItem3.visibility = View.VISIBLE
|
||||||
binding.cvItem2.visibility = View.GONE
|
binding.cvItem2.visibility = View.GONE
|
||||||
binding.cvItem4.visibility = View.GONE
|
binding.cvItem4.visibility = View.GONE
|
||||||
DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
|
DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
|
||||||
Constants.DEVICE_TYPE_HOMOCUBE
|
Constants.DEVICE_TYPE_HEMOCUBE
|
||||||
}
|
}
|
||||||
|
|
||||||
device.productId == Constants.HEMO_CUBE_V2_PRODUCT_ID && device.vendorId == Constants.HEMO_CUBE_V2_VENDOR_ID -> {
|
device.productId == Constants.HEMO_CUBE_V2_PRODUCT_ID && device.vendorId == Constants.HEMO_CUBE_V2_VENDOR_ID -> {
|
||||||
@@ -120,8 +127,8 @@ class MainActivity : AppCompatActivity() {
|
|||||||
binding.cvItem3.visibility = View.VISIBLE
|
binding.cvItem3.visibility = View.VISIBLE
|
||||||
binding.cvItem2.visibility = View.GONE
|
binding.cvItem2.visibility = View.GONE
|
||||||
binding.cvItem4.visibility = View.GONE
|
binding.cvItem4.visibility = View.GONE
|
||||||
DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
|
DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
|
||||||
Constants.DEVICE_TYPE_HOMOCUBE
|
Constants.DEVICE_TYPE_HEMOCUBE
|
||||||
}
|
}
|
||||||
|
|
||||||
device.productId == 24577 && device.vendorId == 1027 -> {
|
device.productId == 24577 && device.vendorId == 1027 -> {
|
||||||
@@ -129,8 +136,8 @@ class MainActivity : AppCompatActivity() {
|
|||||||
binding.cvItem3.visibility = View.VISIBLE
|
binding.cvItem3.visibility = View.VISIBLE
|
||||||
binding.cvItem2.visibility = View.GONE
|
binding.cvItem2.visibility = View.GONE
|
||||||
binding.cvItem4.visibility = View.GONE
|
binding.cvItem4.visibility = View.GONE
|
||||||
DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
|
DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_TRUEHEME)
|
||||||
Constants.DEVICE_TYPE_HOMOCUBE
|
Constants.DEVICE_TYPE_TRUEHEME
|
||||||
}
|
}
|
||||||
|
|
||||||
device.productId == 8963 && device.vendorId == 1659 -> {
|
device.productId == 8963 && device.vendorId == 1659 -> {
|
||||||
@@ -138,8 +145,8 @@ class MainActivity : AppCompatActivity() {
|
|||||||
binding.cvItem3.visibility = View.VISIBLE
|
binding.cvItem3.visibility = View.VISIBLE
|
||||||
binding.cvItem2.visibility = View.GONE
|
binding.cvItem2.visibility = View.GONE
|
||||||
binding.cvItem4.visibility = View.GONE
|
binding.cvItem4.visibility = View.GONE
|
||||||
DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
|
DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
|
||||||
Constants.DEVICE_TYPE_HOMOCUBE
|
Constants.DEVICE_TYPE_HEMOCUBE
|
||||||
}
|
}
|
||||||
|
|
||||||
device.productId == Constants.DEVICE_PRODUCT_ID && device.vendorId == Constants.DEVICE_VENDOR_ID -> {
|
device.productId == Constants.DEVICE_PRODUCT_ID && device.vendorId == Constants.DEVICE_VENDOR_ID -> {
|
||||||
@@ -278,7 +285,6 @@ class MainActivity : AppCompatActivity() {
|
|||||||
// exception.printStackTrace()
|
// exception.printStackTrace()
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
|
fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
|
||||||
location?.let {
|
location?.let {
|
||||||
if (DataHolder.selectedTest != null) {
|
if (DataHolder.selectedTest != null) {
|
||||||
@@ -302,9 +308,6 @@ class MainActivity : AppCompatActivity() {
|
|||||||
val rootView = findViewById<View>(android.R.id.content)
|
val rootView = findViewById<View>(android.R.id.content)
|
||||||
Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
|
Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun requestLocationUpdates() {
|
private fun requestLocationUpdates() {
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ class NatsManager(datacollector: DashboardActivity) {
|
|||||||
fun connect() {
|
fun connect() {
|
||||||
Log.d(TAG, "TRY TO CONNECT")
|
Log.d(TAG, "TRY TO CONNECT")
|
||||||
Thread {
|
Thread {
|
||||||
|
|
||||||
val seedString = "SUAEB5PUWNS6C2HUV3MFI6HUDEAPGPFPBHMI73NHIQATCDD2BWALVEZXZ4"
|
val seedString = "SUAEB5PUWNS6C2HUV3MFI6HUDEAPGPFPBHMI73NHIQATCDD2BWALVEZXZ4"
|
||||||
val seedBytes = seedString.toCharArray()
|
val seedBytes = seedString.toCharArray()
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ 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 androidx.annotation.RequiresApi
|
|
||||||
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
|
||||||
@@ -22,7 +21,7 @@ import `in`.sminnovations.hpostesting.databinding.FragmentAssuranceControlsBindi
|
|||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
|
|
||||||
class AssuranceControlsFragment: Fragment() {
|
class AssuranceControlsFragment: Fragment() {
|
||||||
private lateinit var binding: FragmentAssuranceControlsBinding
|
lateinit var binding: FragmentAssuranceControlsBinding
|
||||||
private lateinit var sharedPreferences: SharedPreferences
|
private lateinit var sharedPreferences: SharedPreferences
|
||||||
|
|
||||||
override fun onCreateView(
|
override fun onCreateView(
|
||||||
@@ -43,7 +42,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", "KMnO4", "Tartrazine", "AR", "HB", "Blood")
|
val solutionOptions = arrayOf("Select solution", "Tartrazine", "AR")
|
||||||
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
|
||||||
@@ -65,7 +64,7 @@ class AssuranceControlsFragment: Fragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val concentrationSpinner: Spinner = binding.spinnerConcentration
|
val concentrationSpinner: Spinner = binding.spinnerConcentration
|
||||||
val concentrationOptions = arrayOf("Select concentration", "250umol", "350umol", "450umol", "550umol", "650umol")
|
val concentrationOptions = arrayOf("Select concentration", "65umol", "45umol", "22.5umol", "12.25umol", "6.125umol", "75umol", "50umol", "25umol", "12.5umol", "6.25umol")
|
||||||
val concentrationAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, concentrationOptions)
|
val concentrationAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, concentrationOptions)
|
||||||
concentrationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
|
concentrationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
|
||||||
concentrationSpinner.adapter = concentrationAdapter
|
concentrationSpinner.adapter = concentrationAdapter
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import android.app.DownloadManager
|
|||||||
import android.content.BroadcastReceiver
|
import android.content.BroadcastReceiver
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.IntentFilter
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
@@ -24,10 +23,6 @@ import com.example.hpostesting.data.constant.LanguageManager
|
|||||||
import com.example.hpostesting.presentation.NatsManager
|
import com.example.hpostesting.presentation.NatsManager
|
||||||
import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
|
import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
|
||||||
import com.google.android.material.navigation.NavigationView
|
import com.google.android.material.navigation.NavigationView
|
||||||
import com.google.android.material.progressindicator.LinearProgressIndicator
|
|
||||||
import com.google.android.play.core.appupdate.AppUpdateManager
|
|
||||||
import com.google.android.play.core.appupdate.AppUpdateManagerFactory
|
|
||||||
|
|
||||||
import com.google.firebase.appdistribution.FirebaseAppDistribution
|
import com.google.firebase.appdistribution.FirebaseAppDistribution
|
||||||
import com.google.firebase.appdistribution.FirebaseAppDistributionException
|
import com.google.firebase.appdistribution.FirebaseAppDistributionException
|
||||||
import com.google.firebase.crashlytics.FirebaseCrashlytics
|
import com.google.firebase.crashlytics.FirebaseCrashlytics
|
||||||
@@ -35,7 +30,6 @@ import dagger.hilt.android.AndroidEntryPoint
|
|||||||
import `in`.sminnovations.hpostesting.R
|
import `in`.sminnovations.hpostesting.R
|
||||||
import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
|
import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
|
||||||
import okhttp3.ResponseBody
|
import okhttp3.ResponseBody
|
||||||
|
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
open interface IDataCollector {
|
open interface IDataCollector {
|
||||||
@@ -82,24 +76,19 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
|
|||||||
"APK UPLOAD ${result.data}",
|
"APK UPLOAD ${result.data}",
|
||||||
Toast.LENGTH_SHORT
|
Toast.LENGTH_SHORT
|
||||||
).show()
|
).show()
|
||||||
// The APK URL LiveData will be updated automatically
|
|
||||||
}
|
}
|
||||||
|
|
||||||
is Result.Error -> {
|
is Result.Error -> {
|
||||||
result.exception.let { message ->
|
result.exception.let { message ->
|
||||||
Toast.makeText(this, "An error occurred On Updating App: $message", Toast.LENGTH_LONG)
|
Toast.makeText(this, "An error occurred On Updating App: $message", Toast.LENGTH_LONG)
|
||||||
.show()
|
.show()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
is Result.Loading -> {
|
is Result.Loading -> {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
else -> {
|
else -> {
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -130,12 +119,8 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun initiateUpdate(responseBody: String) {
|
private fun initiateUpdate(responseBody: String) {
|
||||||
// Extract the URL from the ResponseBody
|
|
||||||
val apkUrl = responseBody
|
val apkUrl = responseBody
|
||||||
|
|
||||||
// Check if the extracted APK URL is valid
|
|
||||||
if (!isValidHttpUrl(apkUrl)) {
|
if (!isValidHttpUrl(apkUrl)) {
|
||||||
// Handle the case where the URL is not valid
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -149,18 +134,12 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
|
|||||||
downloadId = downloadManager.enqueue(request)
|
downloadId = downloadManager.enqueue(request)
|
||||||
|
|
||||||
// Register a BroadcastReceiver to receive the download complete event
|
// Register a BroadcastReceiver to receive the download complete event
|
||||||
val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
|
// val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
|
||||||
registerReceiver(downloadReceiver, filter)
|
// registerReceiver(downloadReceiver, filter)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Function to check if a URL has a valid HTTP/HTTPS scheme
|
|
||||||
// Function to extract the APK URL from the ResponseBody
|
|
||||||
private fun extractApkUrl(responseBody: ResponseBody): String {
|
private fun extractApkUrl(responseBody: ResponseBody): String {
|
||||||
// Assuming your ResponseBody contains the APK URL as a string
|
|
||||||
return responseBody.string()
|
return responseBody.string()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Function to check if a URL has a valid HTTP/HTTPS scheme
|
|
||||||
private fun isValidHttpUrl(url: String): Boolean {
|
private fun isValidHttpUrl(url: String): Boolean {
|
||||||
return url.startsWith("http://") || url.startsWith("https://")
|
return url.startsWith("http://") || url.startsWith("https://")
|
||||||
}
|
}
|
||||||
@@ -168,7 +147,6 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
|
|||||||
override fun onReceive(context: Context?, intent: Intent?) {
|
override fun onReceive(context: Context?, intent: Intent?) {
|
||||||
val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
|
val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
|
||||||
if (id == downloadId) {
|
if (id == downloadId) {
|
||||||
// Install the downloaded APK
|
|
||||||
installApk()
|
installApk()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -201,12 +179,9 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
|
|||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
super.onDestroy()
|
super.onDestroy()
|
||||||
unregisterReceiver(downloadReceiver)
|
// unregisterReceiver(downloadReceiver)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
|
|
||||||
|
|||||||
@@ -118,6 +118,8 @@ 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
|
||||||
@@ -188,12 +190,31 @@ 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 (userID.isNotEmpty() && password.isNotEmpty()) {
|
if (accessToken.isEmpty()) {
|
||||||
if (accessToken.isEmpty()) {
|
|
||||||
hemoCubeViewModel.login(createLoginRequestData(userID, password))
|
hemoCubeViewModel.login(createLoginRequestData(userID, password))
|
||||||
} else {
|
} else {
|
||||||
if (isTokenExpired(accessToken)) {
|
if (isTokenExpired(accessToken)) {
|
||||||
@@ -205,13 +226,6 @@ class HomeFragment : Fragment() {
|
|||||||
hemoCubeViewModel.startPeriodicCheckUpdate()
|
hemoCubeViewModel.startPeriodicCheckUpdate()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} 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 -> {
|
||||||
@@ -237,34 +251,6 @@ class HomeFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
hemoCubeViewModel.deviceUpdate.observe(viewLifecycleOwner) { response ->
|
|
||||||
when (response) {
|
|
||||||
is Result.Success -> {
|
|
||||||
Toast.makeText(
|
|
||||||
requireContext(), response.data.toString(), Toast.LENGTH_SHORT
|
|
||||||
).show()
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
is Result.Error -> {
|
|
||||||
response.exception.let { message ->
|
|
||||||
Toast.makeText(
|
|
||||||
activity,
|
|
||||||
"An error occurred check update: $message",
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
)
|
|
||||||
.show()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
is Result.Loading -> {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
else -> {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
hemoCubeViewModel.uploadLogs.observe(viewLifecycleOwner) { response ->
|
hemoCubeViewModel.uploadLogs.observe(viewLifecycleOwner) { response ->
|
||||||
when (response) {
|
when (response) {
|
||||||
is Result.Success -> {
|
is Result.Success -> {
|
||||||
|
|||||||
@@ -1,20 +1,14 @@
|
|||||||
package com.example.hpostesting.presentation.deviceinfo
|
package com.example.hpostesting.presentation.deviceinfo
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.SharedPreferences
|
|
||||||
import android.util.Log
|
|
||||||
import androidx.lifecycle.LiveData
|
import androidx.lifecycle.LiveData
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.viewModelScope
|
|
||||||
import com.example.hpostesting.data.NetworkStatusLiveData
|
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.Response
|
|
||||||
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.data.repository.Repository
|
import com.example.hpostesting.data.repository.Repository
|
||||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
@HiltViewModel
|
@HiltViewModel
|
||||||
class DeviceViewModel @Inject constructor(
|
class DeviceViewModel @Inject constructor(
|
||||||
|
|||||||
@@ -146,14 +146,40 @@ class DeviceProvisionFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// private fun handleUsbData() {
|
||||||
|
// when {
|
||||||
|
// resultData.contains("SNE") -> {
|
||||||
|
// 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
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
private fun handleUsbData() {
|
private fun handleUsbData() {
|
||||||
when {
|
when {
|
||||||
resultData.contains("SNE") -> {
|
resultData.contains("SNE") -> {
|
||||||
val pattern = Regex("HCV-\\d{3}-\\d{4}")
|
// Updated pattern to match all specified formats
|
||||||
|
val pattern = Regex("HPP1-\\d{4}|HPP1-\\d{3}-\\d{4}|HCV-\\d{3}-\\d{4}")
|
||||||
val matchResult = pattern.find(resultData)
|
val matchResult = pattern.find(resultData)
|
||||||
val hardwareId = matchResult?.value
|
val hardwareId = matchResult?.value
|
||||||
|
|
||||||
if (hardwareId.toString().length == 12) {
|
// Assuming hardwareId validation is based on matching the pattern,
|
||||||
|
// 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()
|
||||||
@@ -165,4 +191,5 @@ class DeviceProvisionFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,29 +1,22 @@
|
|||||||
package com.example.hpostesting.presentation.deviceprovision
|
package com.example.hpostesting.presentation.deviceprovision
|
||||||
|
|
||||||
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 androidx.lifecycle.viewModelScope
|
import androidx.lifecycle.viewModelScope
|
||||||
import com.example.hpostesting.data.NetworkStatusLiveData
|
|
||||||
import com.example.hpostesting.data.Result
|
import com.example.hpostesting.data.Result
|
||||||
import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
|
import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
|
||||||
import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
|
import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
|
||||||
import com.example.hpostesting.data.repository.DatabaseRepository
|
import com.example.hpostesting.data.repository.Repository
|
||||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
@HiltViewModel
|
@HiltViewModel
|
||||||
class DeviceProvisionViewModel @Inject constructor(
|
class DeviceProvisionViewModel @Inject constructor(
|
||||||
private val databaseRepository: DatabaseRepository,
|
private val databaseRepository: Repository
|
||||||
context: Context
|
|
||||||
) : ViewModel() {
|
) : ViewModel() {
|
||||||
|
|
||||||
var isServiceConnected = false
|
var isServiceConnected = false
|
||||||
private val _networkStatusLiveData = NetworkStatusLiveData(context)
|
|
||||||
val networkStatusLiveData: LiveData<Boolean>
|
|
||||||
get() = _networkStatusLiveData
|
|
||||||
|
|
||||||
val deviceProvisionResponse = MutableLiveData<Result<DeviceProvisionResponse>>()
|
val deviceProvisionResponse = MutableLiveData<Result<DeviceProvisionResponse>>()
|
||||||
|
|
||||||
|
|||||||
@@ -1,39 +1,22 @@
|
|||||||
package com.example.hpostesting.presentation.diagnostics
|
package com.example.hpostesting.presentation.diagnostics
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.content.SharedPreferences
|
|
||||||
import android.util.Log
|
|
||||||
import androidx.lifecycle.LiveData
|
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.viewModelScope
|
import androidx.lifecycle.viewModelScope
|
||||||
import com.example.hpostesting.data.DataHolder
|
|
||||||
import com.example.hpostesting.data.NetworkStatusLiveData
|
|
||||||
import com.example.hpostesting.data.constant.Constants
|
|
||||||
import com.example.hpostesting.data.dao.HemoCubeDao
|
|
||||||
import com.example.hpostesting.data.model.Response
|
import com.example.hpostesting.data.model.Response
|
||||||
import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
|
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.data.model.patient.HemoCubeTestData
|
import com.example.hpostesting.data.repository.Repository
|
||||||
import com.example.hpostesting.data.model.patient.toHemoCubeTestData
|
|
||||||
import com.example.hpostesting.data.repository.DatabaseRepository
|
|
||||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import java.text.SimpleDateFormat
|
|
||||||
import java.util.Calendar
|
|
||||||
import java.util.Locale
|
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
@HiltViewModel
|
@HiltViewModel
|
||||||
class DiagnosticsViewModel @Inject constructor(
|
class DiagnosticsViewModel @Inject constructor(
|
||||||
private val hemoCubeDao: HemoCubeDao,
|
private val repository: Repository
|
||||||
private val repository: DatabaseRepository,
|
|
||||||
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 sharedPreference: SharedPreferences =
|
|
||||||
context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
|
|
||||||
|
|
||||||
val deviceData = MutableLiveData<DeviceData?>()
|
val deviceData = MutableLiveData<DeviceData?>()
|
||||||
val fireBaseUpload = MutableLiveData<String>()
|
val fireBaseUpload = MutableLiveData<String>()
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import com.example.hpostesting.data.Result
|
|||||||
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.constant.TestStatus
|
import com.example.hpostesting.data.constant.TestStatus
|
||||||
|
import com.example.hpostesting.data.model.TestState
|
||||||
import com.example.hpostesting.data.model.patient.DeviceData
|
import com.example.hpostesting.data.model.patient.DeviceData
|
||||||
import com.example.hpostesting.data.model.patient.toHemoCubeTestData
|
import com.example.hpostesting.data.model.patient.toHemoCubeTestData
|
||||||
import com.example.hpostesting.presentation.UsbServiceListener
|
import com.example.hpostesting.presentation.UsbServiceListener
|
||||||
@@ -25,12 +26,10 @@ import com.example.hpostesting.presentation.utils.MyDialogListener
|
|||||||
import com.example.hpostesting.presentation.utils.UIUtils
|
import com.example.hpostesting.presentation.utils.UIUtils
|
||||||
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 com.google.firebase.perf.ktx.performance
|
|
||||||
import `in`.sminnovations.hpostesting.R
|
import `in`.sminnovations.hpostesting.R
|
||||||
import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
|
import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
|
||||||
import kotlin.math.abs
|
import kotlin.math.abs
|
||||||
import kotlin.math.log10
|
import kotlin.math.log10
|
||||||
import kotlin.math.round
|
|
||||||
|
|
||||||
@Suppress("MemberVisibilityCanBePrivate")
|
@Suppress("MemberVisibilityCanBePrivate")
|
||||||
class HemoCubeFragment : Fragment() {
|
class HemoCubeFragment : Fragment() {
|
||||||
@@ -44,7 +43,6 @@ class HemoCubeFragment : Fragment() {
|
|||||||
private var resultData: String = ""
|
private var resultData: String = ""
|
||||||
private var currentResultData: String = ""
|
private var currentResultData: String = ""
|
||||||
private var isUsingExistingBuffer = false
|
private var isUsingExistingBuffer = false
|
||||||
private var loginId: String = ""
|
|
||||||
private var isTestOngoing = false
|
private var isTestOngoing = false
|
||||||
private var startListening = MutableLiveData<Boolean>(false)
|
private var startListening = MutableLiveData<Boolean>(false)
|
||||||
private var led1BufferForDevice = 0.0
|
private var led1BufferForDevice = 0.0
|
||||||
@@ -59,7 +57,7 @@ class HemoCubeFragment : Fragment() {
|
|||||||
private var fittedAbs2 = 0.0
|
private var fittedAbs2 = 0.0
|
||||||
private var fittedAbs3 = 0.0
|
private var fittedAbs3 = 0.0
|
||||||
private var fittedAbs4 = 0.0
|
private var fittedAbs4 = 0.0
|
||||||
private var _predictedDenovixRatio = 0.0
|
private var calculatedPredictedDenovixRatio = 0.0
|
||||||
private var validationError = false
|
private var validationError = false
|
||||||
private var deviceHardwareId = ""
|
private var deviceHardwareId = ""
|
||||||
private var allErrorMessages = ""
|
private var allErrorMessages = ""
|
||||||
@@ -68,6 +66,7 @@ class HemoCubeFragment : Fragment() {
|
|||||||
private var readingsPerSample = Constants.READINGS_PER_SAMPLE
|
private var readingsPerSample = Constants.READINGS_PER_SAMPLE
|
||||||
private var uploadedToCloud = false
|
private var uploadedToCloud = false
|
||||||
private var uploadedToMolbio = false
|
private var uploadedToMolbio = false
|
||||||
|
lateinit var testState: TestState
|
||||||
|
|
||||||
override fun onCreateView(
|
override fun onCreateView(
|
||||||
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
|
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
|
||||||
@@ -75,6 +74,11 @@ class HemoCubeFragment : Fragment() {
|
|||||||
binding = FragmentHemoCubeReferenceBinding.inflate(inflater, container, false)
|
binding = FragmentHemoCubeReferenceBinding.inflate(inflater, container, false)
|
||||||
sharedPreferences =
|
sharedPreferences =
|
||||||
requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
|
requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
|
||||||
|
|
||||||
|
testState = TestState(
|
||||||
|
testDetails = DataHolder.selectedTest?.toHemoCubeTestData(),
|
||||||
|
)
|
||||||
|
|
||||||
return binding.root
|
return binding.root
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -119,7 +123,7 @@ class HemoCubeFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
binding.btnPlacebuffer.setOnClickListener {
|
binding.btnPlacebuffer.setOnClickListener {
|
||||||
if (isBufferValueAvailable()) {
|
if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
|
||||||
showBufferAlertDialog()
|
showBufferAlertDialog()
|
||||||
} else {
|
} else {
|
||||||
activity?.runOnUiThread {
|
activity?.runOnUiThread {
|
||||||
@@ -184,23 +188,6 @@ class HemoCubeFragment : Fragment() {
|
|||||||
binding.progressBar.visibility = View.GONE
|
binding.progressBar.visibility = View.GONE
|
||||||
}
|
}
|
||||||
|
|
||||||
// hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
|
|
||||||
// if (result == "Success") {
|
|
||||||
// showToast(R.string.test_upload)
|
|
||||||
// handleReadingFinish()
|
|
||||||
// }
|
|
||||||
// if (result == "Local") {
|
|
||||||
// showToast(R.string.internt_not_local)
|
|
||||||
// handleReadingFinish()
|
|
||||||
// }
|
|
||||||
// if (result == "Error") {
|
|
||||||
// showToast(R.string.error_local)
|
|
||||||
// startActivity(Intent(requireActivity(), DashboardActivity::class.java))
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// binding.progressBar.visibility = View.GONE
|
|
||||||
// }
|
|
||||||
|
|
||||||
hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
|
hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
|
||||||
|
|
||||||
hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
|
hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
|
||||||
@@ -211,9 +198,9 @@ class HemoCubeFragment : Fragment() {
|
|||||||
apply {
|
apply {
|
||||||
DataHolder.hemoCubeTestData?.let {
|
DataHolder.hemoCubeTestData?.let {
|
||||||
currentDeviceData?.coefficients?.let { coefficients ->
|
currentDeviceData?.coefficients?.let { coefficients ->
|
||||||
val coefficient1 = coefficients[0]
|
// val coefficient1 = coefficients[0]
|
||||||
val coefficient2 = coefficients[1]
|
// val coefficient2 = coefficients[1]
|
||||||
val result = coefficient1 * coefficient2
|
// val result = coefficient1 * coefficient2
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
isOnline = isNetworkAvailable
|
isOnline = isNetworkAvailable
|
||||||
@@ -231,6 +218,10 @@ class HemoCubeFragment : Fragment() {
|
|||||||
|
|
||||||
private fun handleReadingFinish() {
|
private fun handleReadingFinish() {
|
||||||
if (allReadingsComplete(repeatReadingCount, readingsPerSample) && uploadedToCloud) {
|
if (allReadingsComplete(repeatReadingCount, readingsPerSample) && uploadedToCloud) {
|
||||||
|
if (validationError) {
|
||||||
|
hemoCubeViewModel.messages.postValue("Error")
|
||||||
|
return
|
||||||
|
}
|
||||||
activity?.runOnUiThread {
|
activity?.runOnUiThread {
|
||||||
binding.btnSubmit.visibility = View.GONE
|
binding.btnSubmit.visibility = View.GONE
|
||||||
val i = Intent(
|
val i = Intent(
|
||||||
@@ -320,9 +311,7 @@ class HemoCubeFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun listenToHemoCube() {
|
private fun listenToHemoCube() {
|
||||||
if (DataHolder.hemoCubeTestData == null) {
|
DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData()
|
||||||
DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData()
|
|
||||||
}
|
|
||||||
hemoCubeViewModel.progressBar.postValue(true)
|
hemoCubeViewModel.progressBar.postValue(true)
|
||||||
|
|
||||||
val fullReadOutput = StringBuilder()
|
val fullReadOutput = StringBuilder()
|
||||||
@@ -367,7 +356,7 @@ class HemoCubeFragment : Fragment() {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handleUsbData(stringData: String) {
|
fun handleUsbData(stringData: String) {
|
||||||
if (stringData.contains("#")) {
|
if (stringData.contains("#")) {
|
||||||
isTestOngoing = true
|
isTestOngoing = true
|
||||||
}
|
}
|
||||||
@@ -378,7 +367,24 @@ class HemoCubeFragment : Fragment() {
|
|||||||
|
|
||||||
when {
|
when {
|
||||||
resultData.contains("SNE") && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
|
resultData.contains("SNE") && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
|
||||||
processHardwareId(resultData)
|
processV2HardwareId(resultData)
|
||||||
|
}
|
||||||
|
|
||||||
|
(resultData.contains("SN") && !resultData.contains("SNS") && !resultData.contains("SNE") && resultData.length >= 15) && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
|
||||||
|
processV1HardwareId(resultData)
|
||||||
|
}
|
||||||
|
|
||||||
|
(resultData.contains("#LS") && this.testStatusCode < TestStatus.FIRST_EMPTY_AIR_READING_STARTED.code) -> {
|
||||||
|
// air reading 1
|
||||||
|
this.testStatusCode = TestStatus.FIRST_EMPTY_AIR_READING_STARTED.code
|
||||||
|
hemoCubeViewModel.messages.postValue("Air reading started")
|
||||||
|
}
|
||||||
|
|
||||||
|
(resultData.contains("#LC") && this.testStatusCode < TestStatus.FIRST_EMPTY_AIR_READING_COMPLETED.code) -> {
|
||||||
|
// air reading 1, send command to print
|
||||||
|
this.testStatusCode = TestStatus.FIRST_EMPTY_AIR_READING_COMPLETED.code
|
||||||
|
hemoCubeViewModel.messages.postValue("Air reading completed")
|
||||||
|
fetchResult()
|
||||||
}
|
}
|
||||||
|
|
||||||
resultData.contains("#BS") && this.testStatusCode < TestStatus.BUFFER_STARTED.code -> {
|
resultData.contains("#BS") && this.testStatusCode < TestStatus.BUFFER_STARTED.code -> {
|
||||||
@@ -394,7 +400,7 @@ class HemoCubeFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
resultData.contains("#SS1") && this.testStatusCode < TestStatus.SAMPLE_STARTED.code -> {
|
(resultData.contains("#SS") || resultData.contains("#SS1")) && this.testStatusCode < TestStatus.SAMPLE_STARTED.code -> {
|
||||||
this.testStatusCode = TestStatus.SAMPLE_STARTED.code
|
this.testStatusCode = TestStatus.SAMPLE_STARTED.code
|
||||||
activity?.runOnUiThread {
|
activity?.runOnUiThread {
|
||||||
binding.tvSubtitle4.text = getString(R.string.sample_started)
|
binding.tvSubtitle4.text = getString(R.string.sample_started)
|
||||||
@@ -402,7 +408,7 @@ class HemoCubeFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
resultData.contains("#SC1") && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.code -> {
|
(resultData.contains("#SC") || resultData.contains("#SC1")) && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.code -> {
|
||||||
this.testStatusCode = TestStatus.SAMPLE_COMPLETED.code
|
this.testStatusCode = TestStatus.SAMPLE_COMPLETED.code
|
||||||
hemoCubeViewModel.messages.postValue(
|
hemoCubeViewModel.messages.postValue(
|
||||||
getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data))
|
getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data))
|
||||||
@@ -449,10 +455,59 @@ class HemoCubeFragment : Fragment() {
|
|||||||
fetchResult()
|
fetchResult()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
(resultData.contains("#LS") && this.testStatusCode < TestStatus.SECOND_EMPTY_AIR_READING_STARTED.code) -> {
|
||||||
|
// air reading 2
|
||||||
|
this.testStatusCode = TestStatus.SECOND_EMPTY_AIR_READING_STARTED.code
|
||||||
|
hemoCubeViewModel.messages.postValue("Air reading started")
|
||||||
|
}
|
||||||
|
|
||||||
|
(resultData.contains("#LC") && this.testStatusCode < TestStatus.SECOND_EMPTY_AIR_READING_COMPLETED.code) -> {
|
||||||
|
// air reading 2, print values
|
||||||
|
this.testStatusCode = TestStatus.SECOND_EMPTY_AIR_READING_COMPLETED.code
|
||||||
|
hemoCubeViewModel.messages.postValue("Air reading completed")
|
||||||
|
fetchResult()
|
||||||
|
}
|
||||||
|
|
||||||
resultData.contains("REND") && this.testStatusCode < TestStatus.SAMPLE_PRINT_COMPLETED.code -> {
|
resultData.contains("REND") && this.testStatusCode < TestStatus.SAMPLE_PRINT_COMPLETED.code -> {
|
||||||
handleSampleCompleted()
|
handleSampleCompleted()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
currentResultData.contains("REND")
|
||||||
|
&& this.testStatusCode >= TestStatus.FIRST_EMPTY_AIR_READING_COMPLETED.code
|
||||||
|
&& this.testStatusCode < TestStatus.FIRST_EMPTY_AIR_READING_PRINT_COMPLETED.code -> {
|
||||||
|
this.testStatusCode = TestStatus.FIRST_GAIN_PRINT_COMPLETED.code
|
||||||
|
hemoCubeViewModel.messages.postValue("First air reading completed")
|
||||||
|
|
||||||
|
val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
|
||||||
|
DataHolder.hemoCubeTestData?.apply {
|
||||||
|
led1Air1 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
|
||||||
|
led2Air1 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
|
||||||
|
led3Air1 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
|
||||||
|
led4Air1 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
|
||||||
|
}
|
||||||
|
|
||||||
|
startBufferProcess()
|
||||||
|
currentResultData = ""
|
||||||
|
}
|
||||||
|
|
||||||
|
currentResultData.contains("REND")
|
||||||
|
&& this.testStatusCode >= TestStatus.SECOND_EMPTY_AIR_READING_COMPLETED.code
|
||||||
|
&& this.testStatusCode < TestStatus.SECOND_EMPTY_AIR_PRINT_COMPLETED.code -> {
|
||||||
|
this.testStatusCode = TestStatus.SECOND_EMPTY_AIR_PRINT_COMPLETED.code
|
||||||
|
hemoCubeViewModel.messages.postValue("Second air reading completed")
|
||||||
|
|
||||||
|
val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
|
||||||
|
DataHolder.hemoCubeTestData?.apply {
|
||||||
|
led1Air2 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
|
||||||
|
led2Air2 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
|
||||||
|
led3Air2 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
|
||||||
|
led4Air2 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
|
||||||
|
}
|
||||||
|
|
||||||
|
sendSecondGainCommand()
|
||||||
|
currentResultData = ""
|
||||||
|
}
|
||||||
|
|
||||||
currentResultData.contains("REND")
|
currentResultData.contains("REND")
|
||||||
&& this.testStatusCode >= TestStatus.FIRST_GAIN_COMPLETED.code
|
&& this.testStatusCode >= TestStatus.FIRST_GAIN_COMPLETED.code
|
||||||
&& this.testStatusCode < TestStatus.FIRST_GAIN_PRINT_COMPLETED.code -> {
|
&& this.testStatusCode < TestStatus.FIRST_GAIN_PRINT_COMPLETED.code -> {
|
||||||
@@ -573,8 +628,8 @@ class HemoCubeFragment : Fragment() {
|
|||||||
currentResultData = ""
|
currentResultData = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
fun processHardwareId(resultData: String) {
|
fun processV1HardwareId(resultData: String) {
|
||||||
val hardwareId = extractMiddleString(resultData)
|
val hardwareId = extractV1HardwareId(resultData)
|
||||||
|
|
||||||
if (!hardwareId.isNullOrBlank()) {
|
if (!hardwareId.isNullOrBlank()) {
|
||||||
updateDeviceId(hardwareId)
|
updateDeviceId(hardwareId)
|
||||||
@@ -582,21 +637,59 @@ class HemoCubeFragment : Fragment() {
|
|||||||
binding.btnPlacebuffer.visibility = View.VISIBLE
|
binding.btnPlacebuffer.visibility = View.VISIBLE
|
||||||
}
|
}
|
||||||
hemoCubeViewModel.messages.postValue(getString(R.string.start))
|
hemoCubeViewModel.messages.postValue(getString(R.string.start))
|
||||||
|
|
||||||
if (!Constants.DEVICE_CONFIGURATION.containsKey(deviceHardwareId)) {
|
|
||||||
deviceHardwareId = "HCV-000-3001"
|
|
||||||
allErrorMessages += "Calibration configuration for this device id is not found\n"
|
|
||||||
}
|
|
||||||
if (!Constants.BUFFER_INTENSITY_THRESHOLDS.containsKey(deviceHardwareId)) {
|
|
||||||
allErrorMessages += "ADC thresholds for this device id are not found\n"
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
hemoCubeViewModel.messages.postValue("Config error")
|
hemoCubeViewModel.messages.postValue("Config error")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!Constants.DEVICE_CONFIGURATION.containsKey(deviceHardwareId)) {
|
||||||
|
assignDefaultDevice(resultData)
|
||||||
|
testState.allErrorMessages += "Calibration configuration for this device id is not found\n"
|
||||||
|
}
|
||||||
|
if (!Constants.BUFFER_INTENSITY_THRESHOLDS.containsKey(deviceHardwareId)) {
|
||||||
|
testState.allErrorMessages += "ADC thresholds for this device id are not found\n"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun extractMiddleString(input: String): String? {
|
fun extractV1HardwareId(input: String): String? {
|
||||||
val pattern = Regex("SNS\\s(.*?)\\sSNE")
|
val regex = Regex("SN (\\S+)")
|
||||||
|
val matchResult = regex.find(input)
|
||||||
|
|
||||||
|
return matchResult?.groupValues?.get(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun processV2HardwareId(resultData: String) {
|
||||||
|
val hardwareId = extractV2HardwareId(resultData)
|
||||||
|
|
||||||
|
if (!hardwareId.isNullOrBlank()) {
|
||||||
|
updateDeviceId(hardwareId)
|
||||||
|
activity?.runOnUiThread {
|
||||||
|
binding.btnPlacebuffer.visibility = View.VISIBLE
|
||||||
|
}
|
||||||
|
hemoCubeViewModel.messages.postValue(getString(R.string.start))
|
||||||
|
} else {
|
||||||
|
hemoCubeViewModel.messages.postValue("Config error")
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Constants.DEVICE_CONFIGURATION.containsKey(deviceHardwareId)) {
|
||||||
|
assignDefaultDevice(resultData)
|
||||||
|
testState.allErrorMessages += "Calibration configuration for this device id is not found\n"
|
||||||
|
}
|
||||||
|
if (!Constants.BUFFER_INTENSITY_THRESHOLDS.containsKey(deviceHardwareId)) {
|
||||||
|
testState.allErrorMessages += "ADC thresholds for this device id are not found\n"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun assignDefaultDevice(configData: String) {
|
||||||
|
deviceHardwareId = "HCV-000-3001"
|
||||||
|
testStatusCode = TestStatus.CONFIG_COMPLETED.code
|
||||||
|
activity?.runOnUiThread {
|
||||||
|
binding.btnPlacebuffer.visibility = View.VISIBLE
|
||||||
|
}
|
||||||
|
hemoCubeViewModel.messages.postValue(getString(R.string.start))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun extractV2HardwareId(input: String): String? {
|
||||||
|
val pattern = Regex("SNS\\s*(.*?)\\s*SNE")
|
||||||
val matchResult: MatchResult? = pattern.find(input)
|
val matchResult: MatchResult? = pattern.find(input)
|
||||||
|
|
||||||
return matchResult?.groups?.get(1)?.value
|
return matchResult?.groups?.get(1)?.value
|
||||||
@@ -635,7 +728,7 @@ class HemoCubeFragment : Fragment() {
|
|||||||
val led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
|
val led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
|
||||||
val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
|
val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
|
||||||
val led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
|
val led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
|
||||||
val deviceRatio = led4Average / led1Average
|
val deviceRatio = led2Average / led1Average
|
||||||
|
|
||||||
if (led1BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
|
if (led1BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
|
||||||
?.get(0)!!
|
?.get(0)!!
|
||||||
@@ -649,8 +742,8 @@ class HemoCubeFragment : Fragment() {
|
|||||||
3
|
3
|
||||||
)?.get(0)!!
|
)?.get(0)!!
|
||||||
) {
|
) {
|
||||||
validationError = true
|
// validationError = true
|
||||||
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
|
||||||
@@ -669,8 +762,8 @@ class HemoCubeFragment : Fragment() {
|
|||||||
3
|
3
|
||||||
)?.get(1)!!
|
)?.get(1)!!
|
||||||
) {
|
) {
|
||||||
validationError = true
|
// validationError = true
|
||||||
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)
|
||||||
@@ -696,29 +789,29 @@ class HemoCubeFragment : Fragment() {
|
|||||||
|
|
||||||
val slope1 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(1)?.get(0)
|
val slope1 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(1)?.get(0)
|
||||||
val intercept1 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(1)?.get(1)
|
val intercept1 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(1)?.get(1)
|
||||||
val _hb1 = (led3Average - intercept1!!) / slope1!!
|
val calculatedHb1 = (led1Average - intercept1!!) / slope1!!
|
||||||
|
|
||||||
val slope2 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(0)
|
val slope2 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(0)
|
||||||
val intercept = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(1)
|
val intercept = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(1)
|
||||||
val _hb2 = (led4Average - intercept!!) / slope2!!
|
val calculatedHb2 = (led2Average - intercept!!) / slope2!!
|
||||||
|
|
||||||
val slope3 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(2)?.get(0)
|
val slope3 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(2)?.get(0)
|
||||||
val intercept3 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(2)?.get(1)
|
val intercept3 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(2)?.get(1)
|
||||||
val _hb3 = (led3Average - intercept3!!) / slope3!!
|
val calculatedHb3 = (led3Average - intercept3!!) / slope3!!
|
||||||
|
|
||||||
val slope4 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(0)
|
val slope4 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(0)
|
||||||
val intercept4 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(1)
|
val intercept4 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(1)
|
||||||
val _hb4 = (led4Average - intercept4!!) / slope4!!
|
val calculatedHb4 = (led4Average - intercept4!!) / slope4!!
|
||||||
|
|
||||||
_predictedDenovixRatio = fittedAbs3.div(fittedAbs1)
|
calculatedPredictedDenovixRatio = fittedAbs3.div(fittedAbs1)
|
||||||
|
|
||||||
val slope = (led1Average - led2Average) / (435 - 415)
|
val slope = (led1Average - led2Average) / (435 - 415)
|
||||||
val _slopeRatio = abs(led3Average / slope)
|
val calculatedSlopeRatio = abs(led3Average / slope)
|
||||||
val slopeClass = slopeRatioClassification(_slopeRatio)
|
val slopeClass = slopeRatioClassification(calculatedSlopeRatio)
|
||||||
|
|
||||||
if (fittedAbs1 <= fittedAbs2) {
|
if (fittedAbs1 <= fittedAbs2) {
|
||||||
validationError = true
|
// validationError = true
|
||||||
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
|
||||||
@@ -726,24 +819,25 @@ class HemoCubeFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (fittedAbs1 < 0 || fittedAbs2 < 0 || fittedAbs3 < 0 || fittedAbs4 < 0) {
|
if (fittedAbs1 < 0 || fittedAbs2 < 0 || fittedAbs3 < 0 || fittedAbs4 < 0) {
|
||||||
validationError = true
|
// validationError = true
|
||||||
activity?.runOnUiThread {
|
activity?.runOnUiThread {
|
||||||
binding.errorMessage.text = getString(R.string.error_negative_abs)
|
binding.errorMessage.text = getString(R.string.error_negative_abs)
|
||||||
// binding.errorMessage.visibility = View.VISIBLE
|
// binding.errorMessage.visibility = View.VISIBLE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((led1Average < 0.7 || led2Average < 0.7 || led3Average < 0.7 || led4Average < 0.7) && _slopeRatio > 35.0) {
|
var absorbanceLowerLimit = 0.0
|
||||||
|
if (led1Average < absorbanceLowerLimit || led2Average < absorbanceLowerLimit || led3Average < absorbanceLowerLimit || led4Average < absorbanceLowerLimit) {
|
||||||
validationError = true
|
validationError = true
|
||||||
activity?.runOnUiThread {
|
activity?.runOnUiThread {
|
||||||
binding.errorMessage.text = "Severely Low Hb. Repeat test with 12 ul in 2 ml Buffer"
|
binding.errorMessage.text = "Invalid"
|
||||||
binding.errorMessage.visibility = View.VISIBLE
|
binding.errorMessage.visibility = View.VISIBLE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fittedAbs3 < 0.1) {
|
if (fittedAbs3 < 0.1) {
|
||||||
validationError = true
|
// validationError = true
|
||||||
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
|
||||||
@@ -769,12 +863,12 @@ class HemoCubeFragment : Fragment() {
|
|||||||
this.abs2 = fittedAbs2
|
this.abs2 = fittedAbs2
|
||||||
this.abs3 = fittedAbs3
|
this.abs3 = fittedAbs3
|
||||||
this.abs4 = fittedAbs4
|
this.abs4 = fittedAbs4
|
||||||
this.hb3 = _hb3
|
this.hb3 = calculatedHb3
|
||||||
this.hb4 = _hb4
|
this.hb4 = calculatedHb4
|
||||||
this.deviceRatio = deviceRatio
|
this.deviceRatio = deviceRatio
|
||||||
this.calculatedRatio = calculateRatio(deviceRatio)
|
this.calculatedRatio = calculateRatio(deviceRatio)
|
||||||
this.predictedDenovixRatio = _predictedDenovixRatio
|
this.predictedDenovixRatio = calculatedPredictedDenovixRatio
|
||||||
this.slopeRatio = _slopeRatio
|
this.slopeRatio = calculatedSlopeRatio
|
||||||
this.coefficients = currentDeviceData?.coefficients?.get(0)
|
this.coefficients = currentDeviceData?.coefficients?.get(0)
|
||||||
.toString() + ", " + currentDeviceData?.coefficients?.get(1).toString()
|
.toString() + ", " + currentDeviceData?.coefficients?.get(1).toString()
|
||||||
this.prdClassification = absorbanceBasedClassification(predictedDenovixRatio)
|
this.prdClassification = absorbanceBasedClassification(predictedDenovixRatio)
|
||||||
@@ -783,8 +877,8 @@ class HemoCubeFragment : Fragment() {
|
|||||||
this.classificationResult = deviceRatioClass //findResult(calculatedRatio)
|
this.classificationResult = deviceRatioClass //findResult(calculatedRatio)
|
||||||
hemoCubeViewModel.messages.postValue("${this.deviceRatioClass} ${if (led4Average < 0.17) " - Low Hb" else ""}\n")
|
hemoCubeViewModel.messages.postValue("${this.deviceRatioClass} ${if (led4Average < 0.17) " - Low Hb" else ""}\n")
|
||||||
if (DataHolder.hemoCubeTestData?.testType == "HB")
|
if (DataHolder.hemoCubeTestData?.testType == "HB")
|
||||||
hemoCubeViewModel.messages.postValue("HB: $_hb4")
|
hemoCubeViewModel.messages.postValue("Hb: $calculatedHb4")
|
||||||
this.errorMessages = allErrorMessages
|
this.errorMessages = testState.allErrorMessages
|
||||||
this.resultData = deviceLog
|
this.resultData = deviceLog
|
||||||
this.batteryLevel = hemoCubeViewModel.getBatteryLevel().toString()
|
this.batteryLevel = hemoCubeViewModel.getBatteryLevel().toString()
|
||||||
this.batteryCapacity =
|
this.batteryCapacity =
|
||||||
@@ -847,36 +941,38 @@ class HemoCubeFragment : Fragment() {
|
|||||||
|
|
||||||
fun deviceRatioClassification(ratio: Double?): String {
|
fun deviceRatioClassification(ratio: Double?): String {
|
||||||
try {
|
try {
|
||||||
hemoCubeViewModel.messages.postValue("result classification")
|
|
||||||
if (ratio != null) {
|
if (ratio != null) {
|
||||||
if (ratio in 0.2..0.29) {
|
if (ratio in 0.1..0.29) {
|
||||||
activity?.runOnUiThread {
|
// setSubtitleTextColor(R.color.green_2)
|
||||||
binding.tvSubtitle4.setTextColor(
|
return "Normal"
|
||||||
ContextCompat.getColor(
|
|
||||||
requireContext(),
|
|
||||||
R.color.green_2
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
return getString(R.string.normal)
|
|
||||||
}
|
}
|
||||||
if (ratio in 0.29..0.32)
|
if (ratio in 0.29..0.32)
|
||||||
return getString(R.string.negative_borderline)
|
return "Negative Borderline, Repeat Test"
|
||||||
if (ratio in 0.32..0.35)
|
if (ratio in 0.32..0.35)
|
||||||
return getString(R.string.sickle_cell_trait)
|
return "Sickle Cell Trait"
|
||||||
if (ratio in 0.35..0.38)
|
if (ratio in 0.35..0.38)
|
||||||
return getString(R.string.positive_for_sickle_cell)
|
return "Positive for Sickle Cell. HPLC for Confirmation"
|
||||||
if (ratio in 0.38..0.5)
|
if (ratio in 0.38..0.5)
|
||||||
return getString(R.string.sickle_cell_disease)
|
return "Sickle Cell Disease"
|
||||||
} else {
|
} else {
|
||||||
return getString(R.string.invalid)
|
return "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 "Invalid"
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setSubtitleTextColor(colorResId: Int) {
|
||||||
|
activity?.runOnUiThread {
|
||||||
|
binding.tvSubtitle4.setTextColor(ContextCompat.getColor(requireContext(), colorResId))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun handleException(e: Exception) {
|
||||||
|
showToast(R.string.error_classification)
|
||||||
|
Firebase.crashlytics.recordException(e)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun slopeRatioClassification(ratio: Double?): String {
|
fun slopeRatioClassification(ratio: Double?): String {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.example.hpostesting.presentation.hemocube
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.IntentFilter
|
import android.content.IntentFilter
|
||||||
import android.content.SharedPreferences
|
|
||||||
import android.os.BatteryManager
|
import android.os.BatteryManager
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import androidx.lifecycle.LiveData
|
import androidx.lifecycle.LiveData
|
||||||
@@ -35,7 +34,6 @@ import com.example.hpostesting.data.model.patient.toHemoCubeTestData
|
|||||||
import com.example.hpostesting.data.model.updates.CheckUpdateRequest
|
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 com.example.hpostesting.data.repository.DatabaseRepository
|
|
||||||
import com.example.hpostesting.data.repository.Repository
|
import com.example.hpostesting.data.repository.Repository
|
||||||
import com.example.hpostesting.domain.CheckUpdateWorker
|
import com.example.hpostesting.domain.CheckUpdateWorker
|
||||||
import com.example.hpostesting.domain.LogFileManager
|
import com.example.hpostesting.domain.LogFileManager
|
||||||
@@ -47,7 +45,6 @@ import okhttp3.RequestBody.Companion.asRequestBody
|
|||||||
import okhttp3.ResponseBody
|
import okhttp3.ResponseBody
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.util.Calendar
|
import java.util.Calendar
|
||||||
import java.util.Date
|
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package com.example.hpostesting.presentation.testRight
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import androidx.lifecycle.LiveData
|
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.viewModelScope
|
import androidx.lifecycle.viewModelScope
|
||||||
@@ -26,7 +25,6 @@ import com.example.hpostesting.domain.TestRightResultCalculation
|
|||||||
import com.example.hpostesting.util.MyUtils
|
import com.example.hpostesting.util.MyUtils
|
||||||
import com.google.firebase.storage.FirebaseStorage
|
import com.google.firebase.storage.FirebaseStorage
|
||||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||||
import dagger.hilt.android.scopes.ViewModelScoped
|
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.coroutines.tasks.await
|
import kotlinx.coroutines.tasks.await
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ class UsbService : Service() {
|
|||||||
fun connect(driver: UsbSerialDriver, connection: UsbDeviceConnection) {
|
fun connect(driver: UsbSerialDriver, connection: UsbDeviceConnection) {
|
||||||
mPort = driver.ports[0] // Most devices have just one port (port 0)
|
mPort = driver.ports[0] // Most devices have just one port (port 0)
|
||||||
mPort.open(connection)
|
mPort.open(connection)
|
||||||
mPort.setParameters(115200, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
|
mPort.setParameters(9600, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
|
||||||
isUsbConnected = true
|
isUsbConnected = true
|
||||||
Log.d(TAG, "My Usb Connected ${mPort.driver}")
|
Log.d(TAG, "My Usb Connected ${mPort.driver}")
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,199 @@
|
|||||||
|
package com.example.hpostesting.presentation.trueheme
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
|
import android.app.PendingIntent
|
||||||
|
import android.content.BroadcastReceiver
|
||||||
|
import android.content.ComponentName
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.IntentFilter
|
||||||
|
import android.content.ServiceConnection
|
||||||
|
import android.hardware.usb.UsbDevice
|
||||||
|
import android.hardware.usb.UsbDeviceConnection
|
||||||
|
import android.hardware.usb.UsbManager
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.os.IBinder
|
||||||
|
import android.util.Log
|
||||||
|
import android.view.Menu
|
||||||
|
import android.widget.Toast
|
||||||
|
import androidx.activity.viewModels
|
||||||
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
|
import androidx.core.content.ContextCompat
|
||||||
|
import androidx.core.view.get
|
||||||
|
import com.example.hpostesting.data.DataHolder
|
||||||
|
import com.example.hpostesting.data.constant.Constants
|
||||||
|
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.hoho.android.usbserial.driver.UsbSerialDriver
|
||||||
|
import com.hoho.android.usbserial.driver.UsbSerialProber
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
|
import `in`.sminnovations.hpostesting.R
|
||||||
|
import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
class TrueHemeActivity : AppCompatActivity() {
|
||||||
|
private lateinit var binding: ActivityHemocubeBinding
|
||||||
|
private val viewModel by viewModels<HemoCubeViewModel>()
|
||||||
|
private var myMenu: Menu? = null
|
||||||
|
|
||||||
|
private lateinit var mDriver: UsbSerialDriver
|
||||||
|
private var mConnection: UsbDeviceConnection? = null
|
||||||
|
lateinit var mService: UsbService
|
||||||
|
|
||||||
|
private val TAG = "HemoCube"
|
||||||
|
|
||||||
|
private val broadcastReceiver = object : BroadcastReceiver() {
|
||||||
|
override fun onReceive(context: Context, intent: Intent) {
|
||||||
|
|
||||||
|
synchronized(this) {
|
||||||
|
val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
|
||||||
|
|
||||||
|
if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
|
||||||
|
device?.apply {
|
||||||
|
connectUsb(true)
|
||||||
|
DataHolder.usbConnected.postValue(true)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
onErrorReported("permission denied for device")
|
||||||
|
DataHolder.usbConnected.postValue(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private val connection = object : ServiceConnection {
|
||||||
|
override fun onServiceConnected(className: ComponentName, service: IBinder) {
|
||||||
|
val binder = service as UsbService.UsbServiceBinder
|
||||||
|
mService = binder.getService()
|
||||||
|
viewModel.isServiceConnected = true
|
||||||
|
mConnection.let { mService.connect(mDriver, mConnection!!) }
|
||||||
|
moveToNext()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onServiceDisconnected(arg0: ComponentName) {
|
||||||
|
viewModel.isServiceConnected = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
override fun attachBaseContext(newBase: Context?) {
|
||||||
|
val languageCode = LanguageManager.getSavedLanguage(newBase!!)
|
||||||
|
LanguageManager.setLocale(newBase, languageCode)
|
||||||
|
super.attachBaseContext(newBase)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
binding = ActivityHemocubeBinding.inflate(layoutInflater)
|
||||||
|
setContentView(binding.root)
|
||||||
|
setSupportActionBar(binding.myToolbar)
|
||||||
|
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||||
|
setupListener()
|
||||||
|
connectUsb(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun setupListener() {
|
||||||
|
DataHolder.usbConnected.observe(this) {
|
||||||
|
Log.d("USB OBSERVE", "HemoCube called -> $it")
|
||||||
|
if (it) {
|
||||||
|
myMenu?.get(0)?.icon =
|
||||||
|
ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_24)
|
||||||
|
} else {
|
||||||
|
myMenu?.get(0)?.icon =
|
||||||
|
ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_off_24)
|
||||||
|
Toast.makeText(this, "Device is Disconnected", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
open fun connectUsb(permissionGranted: Boolean) {
|
||||||
|
Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
|
||||||
|
val manager = getSystemService(Context.USB_SERVICE) as UsbManager
|
||||||
|
val availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager)
|
||||||
|
|
||||||
|
if (availableDrivers.isEmpty()) {
|
||||||
|
onErrorReported("No Device is Connected")
|
||||||
|
} else {
|
||||||
|
mDriver = availableDrivers[0]
|
||||||
|
mConnection = manager.openDevice(mDriver.device)
|
||||||
|
|
||||||
|
if (mConnection == null) {
|
||||||
|
requestUserPermission(manager, mDriver.device)
|
||||||
|
} else {
|
||||||
|
setupService()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@SuppressLint("MutableImplicitPendingIntent")
|
||||||
|
private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
|
||||||
|
val mPendingIntent: PendingIntent
|
||||||
|
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
|
||||||
|
mPendingIntent = PendingIntent.getBroadcast(
|
||||||
|
this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
mPendingIntent = PendingIntent.getBroadcast(
|
||||||
|
this,
|
||||||
|
0,
|
||||||
|
Intent(Constants.HOMOCUBE_USB_PERMISSION),
|
||||||
|
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
|
||||||
|
registerReceiver(broadcastReceiver, filter)
|
||||||
|
manager.requestPermission(device, mPendingIntent)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setupService() {
|
||||||
|
val intent = Intent(this, UsbService::class.java)
|
||||||
|
bindService(intent, connection, Context.BIND_AUTO_CREATE)
|
||||||
|
}
|
||||||
|
|
||||||
|
open fun reconnectDevice() {
|
||||||
|
mService.disconnect()
|
||||||
|
unbindService(connection)
|
||||||
|
viewModel.isServiceConnected = false
|
||||||
|
connectUsb(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun moveToNext() {
|
||||||
|
if (supportFragmentManager.isDestroyed) return
|
||||||
|
|
||||||
|
supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, HemoCubeFragment())
|
||||||
|
.commit()
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
override fun onBackPressed() {
|
||||||
|
val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
|
||||||
|
if (fragment is HemoCubeFragment) {
|
||||||
|
fragment.handleBackButtonPress()
|
||||||
|
} else {
|
||||||
|
super.onBackPressed()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
fun onErrorReported(msg: String) {
|
||||||
|
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
|
||||||
|
if (!isFinishing) onBackPressed()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
||||||
|
menuInflater.inflate(R.menu.my_menu, menu)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onDestroy() {
|
||||||
|
super.onDestroy()
|
||||||
|
if (viewModel.isServiceConnected) {
|
||||||
|
mService.disconnect()
|
||||||
|
unbindService(connection)
|
||||||
|
viewModel.isServiceConnected = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,533 @@
|
|||||||
|
package com.example.hpostesting.presentation.trueheme
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.IntentFilter
|
||||||
|
import android.os.BatteryManager
|
||||||
|
import android.util.Log
|
||||||
|
import androidx.lifecycle.LiveData
|
||||||
|
import androidx.lifecycle.MutableLiveData
|
||||||
|
import androidx.lifecycle.ViewModel
|
||||||
|
import androidx.lifecycle.viewModelScope
|
||||||
|
import androidx.work.ExistingPeriodicWorkPolicy
|
||||||
|
import androidx.work.PeriodicWorkRequestBuilder
|
||||||
|
import androidx.work.WorkManager
|
||||||
|
import com.example.hpostesting.data.CsvWriter
|
||||||
|
import com.example.hpostesting.data.DataHolder
|
||||||
|
import com.example.hpostesting.data.NetworkStatusLiveData
|
||||||
|
import com.example.hpostesting.data.Result
|
||||||
|
import com.example.hpostesting.data.constant.Constants
|
||||||
|
import com.example.hpostesting.data.dao.HemoCubeBufferDao
|
||||||
|
import com.example.hpostesting.data.dao.HemoCubeDao
|
||||||
|
import com.example.hpostesting.data.datasource.LocalFileDataSource
|
||||||
|
import com.example.hpostesting.data.model.Response
|
||||||
|
import com.example.hpostesting.data.model.log.UploadLogsResponse
|
||||||
|
import com.example.hpostesting.data.model.login.LoginRequest
|
||||||
|
import com.example.hpostesting.data.model.login.LoginResponse
|
||||||
|
import com.example.hpostesting.data.model.molbioresult.MolbioV2Result
|
||||||
|
import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultRequest
|
||||||
|
import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultResponse
|
||||||
|
import com.example.hpostesting.data.model.patient.BufferCheckData
|
||||||
|
import com.example.hpostesting.data.model.patient.DeviceData
|
||||||
|
import com.example.hpostesting.data.model.patient.HemoCubeTestData
|
||||||
|
import com.example.hpostesting.data.model.patient.toHemoCubeTestData
|
||||||
|
import com.example.hpostesting.data.model.updates.CheckUpdateRequest
|
||||||
|
import com.example.hpostesting.data.model.updates.CheckUpdateResponse
|
||||||
|
import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
|
||||||
|
import com.example.hpostesting.data.repository.Repository
|
||||||
|
import com.example.hpostesting.domain.CheckUpdateWorker
|
||||||
|
import com.example.hpostesting.domain.LogFileManager
|
||||||
|
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import okhttp3.MediaType.Companion.toMediaTypeOrNull
|
||||||
|
import okhttp3.MultipartBody
|
||||||
|
import okhttp3.RequestBody.Companion.asRequestBody
|
||||||
|
import okhttp3.ResponseBody
|
||||||
|
import java.text.SimpleDateFormat
|
||||||
|
import java.util.Calendar
|
||||||
|
import java.util.Locale
|
||||||
|
import java.util.concurrent.TimeUnit
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
@Suppress("MemberVisibilityCanBePrivate")
|
||||||
|
@HiltViewModel
|
||||||
|
class TrueHemeViewModel @Inject constructor(
|
||||||
|
private val hemoCubeDao: HemoCubeDao,
|
||||||
|
private val hemoCubeBufferDao: HemoCubeBufferDao,
|
||||||
|
private val repository: Repository,
|
||||||
|
private val logFileManager: LogFileManager,
|
||||||
|
private val localFileDataSource: LocalFileDataSource,
|
||||||
|
context: Context,
|
||||||
|
) : ViewModel() {
|
||||||
|
var isServiceConnected = false
|
||||||
|
val progressBar = MutableLiveData(false)
|
||||||
|
private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
|
||||||
|
val messages = MutableLiveData<String>()
|
||||||
|
private val sharedPreference =
|
||||||
|
context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
|
||||||
|
|
||||||
|
private val workManager = WorkManager.getInstance(context)
|
||||||
|
|
||||||
|
// init {
|
||||||
|
// startPeriodicCheckUpdate()
|
||||||
|
// }
|
||||||
|
|
||||||
|
val loginResponse = MutableLiveData<Result<LoginResponse>>()
|
||||||
|
|
||||||
|
val resultUpload = MutableLiveData<Result<MolbioV2ResultResponse>>()
|
||||||
|
|
||||||
|
val checkUpdate = MutableLiveData<Result<CheckUpdateResponse>>()
|
||||||
|
|
||||||
|
val deviceUpdate = MutableLiveData<Result<ResponseBody>>()
|
||||||
|
|
||||||
|
val uploadLogs = MutableLiveData<Result<UploadLogsResponse>?>()
|
||||||
|
|
||||||
|
|
||||||
|
// Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
|
||||||
|
|
||||||
|
private val _networkStatusLiveData = NetworkStatusLiveData(context)
|
||||||
|
val allUserData = hemoCubeDao.getAll()
|
||||||
|
val allKitTestData = hemoCubeBufferDao.getAll()
|
||||||
|
val deviceData = MutableLiveData<DeviceData?>()
|
||||||
|
|
||||||
|
|
||||||
|
val networkStatusLiveData: LiveData<Boolean>
|
||||||
|
get() = _networkStatusLiveData
|
||||||
|
val deviceMessages = MutableLiveData<String?>()
|
||||||
|
val fireBaseUpload = MutableLiveData<String>()
|
||||||
|
val fireBaseBulkUpload = MutableLiveData<String>()
|
||||||
|
|
||||||
|
private val batteryStatus: Intent? =
|
||||||
|
IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
|
||||||
|
context.registerReceiver(null, ifilter)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun uploadHemoCubeResultToDatabase(
|
||||||
|
isOnline: Boolean, testStatus: Boolean, kitSerial: String?,
|
||||||
|
) = viewModelScope.launch {
|
||||||
|
if (kitSerial != null) {
|
||||||
|
testDetails?.kitSerial = kitSerial
|
||||||
|
}
|
||||||
|
testDetails?.testStatus = testStatus
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (isOnline) {
|
||||||
|
parseData()
|
||||||
|
addResultTestToDb()
|
||||||
|
} else {
|
||||||
|
parseData()
|
||||||
|
testDetails?.testTime = SimpleDateFormat(
|
||||||
|
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
||||||
|
).format(Calendar.getInstance().time)
|
||||||
|
hemoCubeDao.insertAll(testDetails!!)
|
||||||
|
fireBaseUpload.postValue("Local")
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.e("Testdb", "Upload failed: ${e.message}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun login(loginRequest: LoginRequest) = viewModelScope.launch {
|
||||||
|
loginResponse.postValue(Result.Loading())
|
||||||
|
repository.login(loginRequest).let {
|
||||||
|
loginResponse.postValue(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun uploadResult(molbioV2ResultRequest: MolbioV2ResultRequest) = viewModelScope.launch {
|
||||||
|
resultUpload.postValue(Result.Loading())
|
||||||
|
repository.uploadResults(molbioV2ResultRequest).let {
|
||||||
|
resultUpload.postValue(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun checkUpdate(checkUpdateRequest: CheckUpdateRequest) = viewModelScope.launch {
|
||||||
|
checkUpdate.postValue(Result.Loading())
|
||||||
|
repository.checkUpdate(checkUpdateRequest).let {
|
||||||
|
checkUpdate.postValue(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest) = viewModelScope.launch {
|
||||||
|
deviceUpdate.postValue(Result.Loading())
|
||||||
|
repository.deviceUpdate(deviceUpdateRequest).let {
|
||||||
|
deviceUpdate.postValue(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun startPeriodicCheckUpdate() {
|
||||||
|
val periodicRequest = PeriodicWorkRequestBuilder<CheckUpdateWorker>(
|
||||||
|
repeatInterval = 1, repeatIntervalTimeUnit = TimeUnit.MINUTES
|
||||||
|
).build()
|
||||||
|
|
||||||
|
workManager.enqueueUniquePeriodicWork(
|
||||||
|
"checkUpdateWorker", ExistingPeriodicWorkPolicy.KEEP, periodicRequest
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun uploadLogs() = viewModelScope.launch {
|
||||||
|
uploadLogs.postValue(Result.Loading())
|
||||||
|
val logFile = logFileManager.createLogFile().let { file ->
|
||||||
|
val requestBody = file?.asRequestBody("multipart/form-data".toMediaTypeOrNull())
|
||||||
|
val multipartFile =
|
||||||
|
requestBody?.let { MultipartBody.Part.createFormData("logFile", file?.name, it) }
|
||||||
|
multipartFile?.let { partFile ->
|
||||||
|
repository.uploadLogs(partFile).let { result ->
|
||||||
|
uploadLogs.postValue(result)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun uploadHemoCubeResultToDatabaseForBufferCheck(
|
||||||
|
isOnline: Boolean,
|
||||||
|
bufferCheckData: BufferCheckData,
|
||||||
|
) =
|
||||||
|
viewModelScope.launch {
|
||||||
|
if (isOnline) {
|
||||||
|
try {
|
||||||
|
when (val response =
|
||||||
|
repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
|
||||||
|
is Response.Success -> {
|
||||||
|
Log.i("Testdb", "Data uploaded to Firestore successfully")
|
||||||
|
fireBaseUpload.postValue("Success")
|
||||||
|
bufferCheckData.localFlag = true
|
||||||
|
hemoCubeBufferDao.insertAll(bufferCheckData)
|
||||||
|
}
|
||||||
|
|
||||||
|
is Response.Error -> {
|
||||||
|
Log.e("Testdb", "Error uploading data to Firestore: $response")
|
||||||
|
fireBaseUpload.postValue("Error")
|
||||||
|
bufferCheckData.localFlag = true
|
||||||
|
hemoCubeBufferDao.insertAll(bufferCheckData)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> {}
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.e("Testdb", "Exception during data upload: ${e.message}")
|
||||||
|
fireBaseUpload.postValue("Error")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
hemoCubeBufferDao.insertAll(bufferCheckData)
|
||||||
|
fireBaseUpload.postValue("Local")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun bulkAddResultKitTestToDb(bufferCheckData: BufferCheckData) {
|
||||||
|
viewModelScope.launch {
|
||||||
|
bufferCheckData.reportUploadTime = SimpleDateFormat(
|
||||||
|
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
||||||
|
).format(Calendar.getInstance().time)
|
||||||
|
when (repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
|
||||||
|
is Response.Success -> {
|
||||||
|
fireBaseBulkUpload.postValue("Success")
|
||||||
|
updateBufferLocalFlag(bufferCheckData._id)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> {
|
||||||
|
fireBaseBulkUpload.postValue("Error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun uploadHemoCubeResultToDatabaseforbuffercheckN(bufferCheckData: BufferCheckData) =
|
||||||
|
viewModelScope.launch {
|
||||||
|
addResultTestToDbforbuffercheck(bufferCheckData)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getDeviceData(deviceId: String?) = viewModelScope.launch {
|
||||||
|
deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
|
||||||
|
}
|
||||||
|
|
||||||
|
fun parseData() {
|
||||||
|
testDetails?.deviceRatio = DataHolder.hemocubeResult
|
||||||
|
testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
|
||||||
|
testDetails?.location = DataHolder.location
|
||||||
|
testDetails?.testTime = SimpleDateFormat(
|
||||||
|
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
||||||
|
).format(Calendar.getInstance().time)
|
||||||
|
testDetails?.appVersion = DataHolder.hemoCubeTestData?.appVersion
|
||||||
|
testDetails?.deviceId = DataHolder.hemoCubeTestData?.deviceId
|
||||||
|
testDetails?.deviceSerialNumber =
|
||||||
|
sharedPreference.getString(Constants.USER_ID, "").toString()
|
||||||
|
testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
|
||||||
|
testDetails?.led1Buffer = DataHolder.hemoCubeTestData?.led1Buffer
|
||||||
|
testDetails?.led2Buffer = DataHolder.hemoCubeTestData?.led2Buffer
|
||||||
|
testDetails?.led3Buffer = DataHolder.hemoCubeTestData?.led3Buffer
|
||||||
|
testDetails?.led4Buffer = DataHolder.hemoCubeTestData?.led4Buffer
|
||||||
|
testDetails?.led1Sample = DataHolder.hemoCubeTestData?.led1Sample
|
||||||
|
testDetails?.led2Sample = DataHolder.hemoCubeTestData?.led2Sample
|
||||||
|
testDetails?.led3Sample = DataHolder.hemoCubeTestData?.led3Sample
|
||||||
|
testDetails?.led4Sample = DataHolder.hemoCubeTestData?.led4Sample
|
||||||
|
testDetails?.led1Average = DataHolder.hemoCubeTestData?.led1Average
|
||||||
|
testDetails?.led2Average = DataHolder.hemoCubeTestData?.led2Average
|
||||||
|
testDetails?.led3Average = DataHolder.hemoCubeTestData?.led3Average
|
||||||
|
testDetails?.led4Average = DataHolder.hemoCubeTestData?.led4Average
|
||||||
|
testDetails?.abs1 = DataHolder.hemoCubeTestData?.abs1
|
||||||
|
testDetails?.abs2 = DataHolder.hemoCubeTestData?.abs2
|
||||||
|
testDetails?.abs3 = DataHolder.hemoCubeTestData?.abs3
|
||||||
|
testDetails?.abs4 = DataHolder.hemoCubeTestData?.abs4
|
||||||
|
testDetails?.deviceRatio = DataHolder.hemoCubeTestData?.deviceRatio
|
||||||
|
testDetails?.slopeRatio = DataHolder.hemoCubeTestData?.slopeRatio
|
||||||
|
testDetails?.predictedDenovixRatio = DataHolder.hemoCubeTestData?.predictedDenovixRatio
|
||||||
|
testDetails?.calculatedRatio = DataHolder.hemoCubeTestData?.calculatedRatio
|
||||||
|
testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients
|
||||||
|
testDetails?.incubationTime = DataHolder.hemoCubeTestData?.incubationTime.toString()
|
||||||
|
testDetails?.name = DataHolder.hemoCubeTestData?.name.toString()
|
||||||
|
testDetails?.birthYear = DataHolder.hemoCubeTestData?.birthYear.toString()
|
||||||
|
testDetails?.userImageURL = DataHolder.hemoCubeTestData?.userImageURL.toString()
|
||||||
|
testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
|
||||||
|
testDetails?.prdClassification = DataHolder.hemoCubeTestData?.prdClassification.toString()
|
||||||
|
testDetails?.deviceRatioClass = DataHolder.hemoCubeTestData?.deviceRatioClass.toString()
|
||||||
|
testDetails?.slopeRatioClass = DataHolder.hemoCubeTestData?.slopeRatioClass.toString()
|
||||||
|
testDetails?.errorMessages = DataHolder.hemoCubeTestData?.errorMessages.toString()
|
||||||
|
testDetails?.batteryLevel = DataHolder.hemoCubeTestData?.batteryLevel.toString()
|
||||||
|
testDetails?.batteryCapacity = DataHolder.hemoCubeTestData?.batteryCapacity.toString()
|
||||||
|
testDetails?.batteryMaxCapacity = DataHolder.hemoCubeTestData?.batteryMaxCapacity.toString()
|
||||||
|
testDetails?.batteryTemperature = DataHolder.hemoCubeTestData?.batteryTemperature.toString()
|
||||||
|
testDetails?.batteryVoltage = DataHolder.hemoCubeTestData?.batteryVoltage.toString()
|
||||||
|
testDetails?.quickCapture = DataHolder.hemoCubeTestData?.quickCapture!!
|
||||||
|
testDetails?.solution = DataHolder.hemoCubeTestData?.solution
|
||||||
|
testDetails?.concentration = DataHolder.hemoCubeTestData?.concentration
|
||||||
|
testDetails?.volume = DataHolder.hemoCubeTestData?.volume
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun addResultTestToDb() {
|
||||||
|
viewModelScope.launch {
|
||||||
|
try {
|
||||||
|
testDetails!!.reportUploadTime = SimpleDateFormat(
|
||||||
|
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
||||||
|
).format(Calendar.getInstance().time)
|
||||||
|
|
||||||
|
when (val response = repository.addTestToDatabase(testDetails)) {
|
||||||
|
is Response.Success -> {
|
||||||
|
val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
|
||||||
|
with(sharedPreference.edit()) {
|
||||||
|
putInt(Constants.KIT_COUNT, kitCount.plus(1))
|
||||||
|
apply()
|
||||||
|
}
|
||||||
|
Log.i("Testdb", "Data uploaded to Firestore successfully")
|
||||||
|
fireBaseUpload.postValue("Success")
|
||||||
|
testDetails.localFlag = true
|
||||||
|
uploadResult(
|
||||||
|
MolbioV2ResultRequest(
|
||||||
|
mutableListOf(
|
||||||
|
MolbioV2Result(
|
||||||
|
rawData = testDetails,
|
||||||
|
analysisId = testDetails._id,
|
||||||
|
analysisDate = testDetails.testTime,
|
||||||
|
analysisStatus = testDetails.classificationResult,
|
||||||
|
thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[testDetails.deviceId].toString(),
|
||||||
|
interpretation = testDetails.classificationResult,
|
||||||
|
testId = testDetails._id,
|
||||||
|
testTime = testDetails.testTime,
|
||||||
|
collectionTime = testDetails.testTime,
|
||||||
|
expiryTime = testDetails.testTime,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
hemoCubeDao.insertAll(testDetails)
|
||||||
|
}
|
||||||
|
|
||||||
|
is Response.Error -> {
|
||||||
|
Log.e("Testdb", "Error uploading data to Firestore: $response")
|
||||||
|
fireBaseUpload.postValue("Error")
|
||||||
|
hemoCubeDao.insertAll(testDetails)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> {}
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.e("Testdb", "Exception during data upload: ${e.message}")
|
||||||
|
fireBaseUpload.postValue("Error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun bulkAddResultTestToDb(userData: HemoCubeTestData) {
|
||||||
|
viewModelScope.launch {
|
||||||
|
userData.reportUploadTime = SimpleDateFormat(
|
||||||
|
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
||||||
|
).format(Calendar.getInstance().time)
|
||||||
|
when (repository.addTestToDatabase(userData)) {
|
||||||
|
is Response.Success -> {
|
||||||
|
fireBaseBulkUpload.postValue("Success")
|
||||||
|
updateLocalFlag(userData._id)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> {
|
||||||
|
fireBaseBulkUpload.postValue("Error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun updateLocalFlag(userId: String) = viewModelScope.launch {
|
||||||
|
hemoCubeDao.updateFieldById(id = userId, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun updateMolbioFlag(userId: String) = viewModelScope.launch {
|
||||||
|
hemoCubeDao.updateMolbioFlag(id = userId, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun addUser(userData: HemoCubeTestData) = viewModelScope.launch {
|
||||||
|
hemoCubeDao.insertAll(userData)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun deleteById(userId: String) = viewModelScope.launch {
|
||||||
|
hemoCubeDao.deleteById(id = userId)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private fun addResultTestToDbforbuffercheck(bufferCheckData: BufferCheckData) {
|
||||||
|
viewModelScope.launch {
|
||||||
|
try {
|
||||||
|
|
||||||
|
when (val response =
|
||||||
|
repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
|
||||||
|
is Response.Success -> {
|
||||||
|
Log.i("Testdb", "Data uploaded to Firestore successfully")
|
||||||
|
fireBaseUpload.postValue("Success")
|
||||||
|
}
|
||||||
|
|
||||||
|
is Response.Error -> {
|
||||||
|
Log.e("Testdb", "Error uploading data to Firestore: $response")
|
||||||
|
fireBaseUpload.postValue("Error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.e("Testdb", "Exception during data upload: ${e.message}")
|
||||||
|
fireBaseUpload.postValue("Error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun updateBufferLocalFlag(bufferId: String) =
|
||||||
|
viewModelScope.launch {
|
||||||
|
hemoCubeBufferDao.updateFieldById(id = bufferId, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getLocalUserDataForCsv(context: Context): Boolean {
|
||||||
|
val localUserDataLiveData: LiveData<List<HemoCubeTestData>> = hemoCubeDao.getAll()
|
||||||
|
|
||||||
|
// Observe the LiveData to get the actual data when available
|
||||||
|
localUserDataLiveData.observeForever { localUserData ->
|
||||||
|
localUserData?.let {
|
||||||
|
val csvData = mutableListOf<Array<String>>()
|
||||||
|
|
||||||
|
it.forEach { userData ->
|
||||||
|
csvData.add(
|
||||||
|
arrayOf(
|
||||||
|
userData._id,
|
||||||
|
userData.name,
|
||||||
|
userData.bloodGroup,
|
||||||
|
userData.birthYear,
|
||||||
|
userData.classificationResult,
|
||||||
|
userData.testTime.toString(),
|
||||||
|
userData.userImageURL
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
val csvWriter = CsvWriter(context)
|
||||||
|
csvWriter.writeCsv("userData.csv", csvData)
|
||||||
|
|
||||||
|
// Remove the observer to avoid leaks
|
||||||
|
localUserDataLiveData.removeObserver {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true // Assuming success, you might want to modify this based on your actual logic
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getBatteryLevel(): Float? {
|
||||||
|
val batteryPct: Float? = batteryStatus?.let { intent ->
|
||||||
|
val level: Int =
|
||||||
|
intent.getIntExtra(
|
||||||
|
BatteryManager.EXTRA_LEVEL,
|
||||||
|
-1
|
||||||
|
)
|
||||||
|
val scale: Int =
|
||||||
|
intent.getIntExtra(
|
||||||
|
BatteryManager.EXTRA_SCALE,
|
||||||
|
-1
|
||||||
|
)
|
||||||
|
level * 100 / scale.toFloat()
|
||||||
|
}
|
||||||
|
|
||||||
|
return batteryPct
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getBatteryTemperature(): Float? {
|
||||||
|
val batteryTemp: Float? = batteryStatus?.let { intent ->
|
||||||
|
val temperature = intent.getIntExtra(
|
||||||
|
BatteryManager.EXTRA_TEMPERATURE,
|
||||||
|
0
|
||||||
|
)
|
||||||
|
temperature.toFloat() / 10
|
||||||
|
}
|
||||||
|
|
||||||
|
return batteryTemp
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getBatteryVoltage(context: Context): Float {
|
||||||
|
val batteryIntent =
|
||||||
|
context.registerReceiver(
|
||||||
|
null,
|
||||||
|
IntentFilter(Intent.ACTION_BATTERY_CHANGED)
|
||||||
|
)
|
||||||
|
val voltage = batteryIntent?.getIntExtra(
|
||||||
|
BatteryManager.EXTRA_VOLTAGE,
|
||||||
|
0
|
||||||
|
) ?: 0
|
||||||
|
|
||||||
|
// milli-volts to volts
|
||||||
|
return voltage.toFloat() / 1000
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
fun getBatteryCapacity(context: Context): Int {
|
||||||
|
val batteryManager =
|
||||||
|
context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
|
||||||
|
val currentCapacity =
|
||||||
|
batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
|
||||||
|
|
||||||
|
return currentCapacity
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getBatteryMaxCapacity(context: Context): Float {
|
||||||
|
val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
|
||||||
|
val designCapacity =
|
||||||
|
batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
|
||||||
|
val currentCapacity =
|
||||||
|
batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
|
||||||
|
|
||||||
|
// Calculate the estimated maximum battery capacity in mAh
|
||||||
|
val maxCapacity = currentCapacity.toFloat() / designCapacity.toFloat() * 100
|
||||||
|
|
||||||
|
return maxCapacity
|
||||||
|
}
|
||||||
|
|
||||||
|
fun createCSV(hemoCubeTestData: List<HemoCubeTestData>, appContext: Context) =
|
||||||
|
viewModelScope.launch {
|
||||||
|
val fileName = "HPOS${getCurrentDate()}.csv"
|
||||||
|
if (localFileDataSource.exportDataToCSV(fileName, hemoCubeTestData)) {
|
||||||
|
hemoCubeTestData.forEach { data ->
|
||||||
|
data.localFlag = true
|
||||||
|
hemoCubeDao.updateCSVFieldById(
|
||||||
|
data._id,
|
||||||
|
true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getCurrentDate(): String {
|
||||||
|
return SimpleDateFormat(
|
||||||
|
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
||||||
|
).format(Calendar.getInstance().time)
|
||||||
|
}
|
||||||
|
}
|
||||||
9
app/src/main/res/layout/activity_kitscan_java.xml
Normal file
9
app/src/main/res/layout/activity_kitscan_java.xml
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context="com.example.hpostesting.presentation.KitscanJava">
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
35
app/src/main/res/layout/activity_trueheme.xml
Normal file
35
app/src/main/res/layout/activity_trueheme.xml
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/cl_parent"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.Toolbar
|
||||||
|
android:id="@+id/my_toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
android:background="?attr/colorPrimary"
|
||||||
|
app:titleTextColor="#FFFFFF"
|
||||||
|
android:elevation="4dp"
|
||||||
|
app:menu="@menu/my_menu"
|
||||||
|
android:theme="@style/ToolbarTheme"
|
||||||
|
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
android:id="@+id/fg_trueheme"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/my_toolbar"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
tools:context=".presentation.trueheme.TrueHemeActivity">
|
||||||
|
</FrameLayout>
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
</layout>
|
||||||
@@ -62,6 +62,7 @@
|
|||||||
<Spinner
|
<Spinner
|
||||||
android:id="@+id/spinner_volume"
|
android:id="@+id/spinner_volume"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
android:visibility="gone"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="52dp"
|
android:layout_marginTop="52dp"
|
||||||
android:background="@drawable/spinner_border"
|
android:background="@drawable/spinner_border"
|
||||||
|
|||||||
@@ -92,7 +92,7 @@
|
|||||||
app:cornerRadius="16dp"
|
app:cornerRadius="16dp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/btn_calibration" />
|
app:layout_constraintTop_toBottomOf="@id/btn_deviceInfo" />
|
||||||
|
|
||||||
<com.google.android.material.button.MaterialButton
|
<com.google.android.material.button.MaterialButton
|
||||||
android:id="@+id/btn_deviceInfo"
|
android:id="@+id/btn_deviceInfo"
|
||||||
|
|||||||
@@ -214,7 +214,7 @@
|
|||||||
android:layout_width="414dp"
|
android:layout_width="414dp"
|
||||||
android:layout_height="201dp"
|
android:layout_height="201dp"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="#SS1\n#SC1"
|
android:text="no device message"
|
||||||
android:textColor="@color/black"
|
android:textColor="@color/black"
|
||||||
android:textSize="11sp"
|
android:textSize="11sp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
|||||||
264
app/src/main/res/layout/fragment_trueheme_sample.xml
Normal file
264
app/src/main/res/layout/fragment_trueheme_sample.xml
Normal file
@@ -0,0 +1,264 @@
|
|||||||
|
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
tools:context="com.example.hpostesting.presentation.trueheme.TrueHemeFragment">
|
||||||
|
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/cl_parent"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_title"
|
||||||
|
style="@style/title1"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:text="@string/Instructions"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_subtitle2"
|
||||||
|
style="@style/title2"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tv_title" />
|
||||||
|
|
||||||
|
<!-- <TextView-->
|
||||||
|
<!-- android:id="@+id/tv_subtitle3"-->
|
||||||
|
<!-- style="@style/title2"-->
|
||||||
|
<!-- android:layout_width="0dp"-->
|
||||||
|
<!-- android:layout_height="wrap_content"-->
|
||||||
|
<!-- android:layout_marginHorizontal="24dp"-->
|
||||||
|
<!-- android:layout_marginTop="16dp"-->
|
||||||
|
<!-- android:text="@string/step5"-->
|
||||||
|
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||||
|
<!-- app:layout_constraintStart_toStartOf="parent"-->
|
||||||
|
<!-- app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />-->
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_name"
|
||||||
|
style="@style/title2"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:padding="12dp"
|
||||||
|
android:layout_marginTop="26dp"
|
||||||
|
android:textFontWeight="700"
|
||||||
|
android:text="Name: SMI\n ID: 1672282828"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
tools:ignore="MissingConstraints" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_subtitle4"
|
||||||
|
style="@style/title1_1"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:layout_marginTop="72dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:textColor="@color/red"
|
||||||
|
android:textSize="18sp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/et_abha_id" />
|
||||||
|
|
||||||
|
|
||||||
|
<!-- <Button-->
|
||||||
|
<!-- android:visibility="gone"-->
|
||||||
|
<!-- android:id="@+id/btn_samplestart"-->
|
||||||
|
<!-- android:layout_width="wrap_content"-->
|
||||||
|
<!-- android:layout_height="wrap_content"-->
|
||||||
|
<!-- android:layout_marginHorizontal="16dp"-->
|
||||||
|
<!-- android:layout_marginTop="24dp"-->
|
||||||
|
<!-- android:clickable="false"-->
|
||||||
|
<!-- android:text="@string/Start_Sample"-->
|
||||||
|
<!-- android:textColor="@color/white"-->
|
||||||
|
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||||
|
<!-- app:layout_constraintStart_toStartOf="parent"-->
|
||||||
|
<!-- app:layout_constraintTop_toBottomOf="@id/til_blood_group" />-->
|
||||||
|
|
||||||
|
|
||||||
|
<!-- <Button-->
|
||||||
|
<!-- android:id="@+id/btn_placebuffer"-->
|
||||||
|
<!-- android:layout_width="wrap_content"-->
|
||||||
|
<!-- android:layout_height="wrap_content"-->
|
||||||
|
<!-- android:layout_marginHorizontal="16dp"-->
|
||||||
|
<!-- android:layout_marginTop="24dp"-->
|
||||||
|
<!-- android:clickable="false"-->
|
||||||
|
<!-- android:text="@string/place_buffer"-->
|
||||||
|
<!-- android:textColor="@color/white"-->
|
||||||
|
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||||
|
<!-- app:layout_constraintStart_toStartOf="parent"-->
|
||||||
|
<!-- app:layout_constraintTop_toBottomOf="@id/btn_submit" />-->
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_title2"
|
||||||
|
style="@style/title1"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:layout_marginTop="48dp"
|
||||||
|
android:text="@string/enter_kit_serial_number_manually"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
tools:ignore="MissingConstraints" />
|
||||||
|
|
||||||
|
|
||||||
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
|
android:id="@+id/et_abha_id"
|
||||||
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="24dp"
|
||||||
|
android:layout_marginTop="20dp"
|
||||||
|
app:layout_constraintEnd_toStartOf="@id/btn_go"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tv_title2">
|
||||||
|
|
||||||
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
|
android:id="@+id/name_edit_text"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:maxLength="17"
|
||||||
|
android:inputType="text"
|
||||||
|
android:hint="@string/serial_number" />
|
||||||
|
|
||||||
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
<com.google.android.material.button.MaterialButton
|
||||||
|
android:id="@+id/btn_go"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="24dp"
|
||||||
|
android:text="@string/go"
|
||||||
|
app:cornerRadius="16dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/et_abha_id"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="1.0"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/et_abha_id"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/et_abha_id" />
|
||||||
|
<Button
|
||||||
|
android:visibility="gone"
|
||||||
|
android:id="@+id/btn_samplestart"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="16dp"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:clickable="false"
|
||||||
|
android:text="@string/Start_Sample"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
app:cornerRadius="16dp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/btn_placebuffer" />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btn_placebuffer"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="16dp"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:clickable="false"
|
||||||
|
android:text="@string/place_buffer"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
app:cornerRadius="16dp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/btn_submit" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btn_submit"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="16dp"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:clickable="false"
|
||||||
|
android:text="@string/submit"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
app:cornerRadius="16dp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/error_message"
|
||||||
|
style="@style/title1_1"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="40dp"
|
||||||
|
android:layout_marginHorizontal="24dp"
|
||||||
|
android:layout_marginTop="72dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:textColor="@color/red"
|
||||||
|
android:textSize="12sp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/btn_submit" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_device_messages"
|
||||||
|
style="@style/title1_1"
|
||||||
|
android:layout_width="414dp"
|
||||||
|
android:layout_height="201dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="no device message"
|
||||||
|
android:textColor="@color/black"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/error_message" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:visibility="gone"
|
||||||
|
android:id="@+id/btn_digitalCard"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="16dp"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:clickable="false"
|
||||||
|
android:text="DigitalCard View"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/error_message" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/iv_check"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:layout_width="100dp"
|
||||||
|
android:layout_height="100dp"
|
||||||
|
android:layout_marginTop="40dp"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
|
android:src="@drawable/check"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tv_device_messages" />
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
android:id="@+id/progressBar"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
android:elevation="12dp"
|
||||||
|
android:indeterminate="true"
|
||||||
|
android:indeterminateDrawable="@drawable/progressbar_drawable"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
</layout>
|
||||||
@@ -101,7 +101,7 @@
|
|||||||
<string name="normal">Normal</string>
|
<string name="normal">Normal</string>
|
||||||
<string name="sickle_cell_disease">Sickle Cell Disease</string>
|
<string name="sickle_cell_disease">Sickle Cell Disease</string>
|
||||||
<string name="sickle_cell_trait">Sickle Cell Trait</string>
|
<string name="sickle_cell_trait">Sickle Cell Trait</string>
|
||||||
<string name="undefined">Undefined\ \ </string>
|
<string name="undefined">Undefined</string>
|
||||||
<string name="sicklecell_nconfirmatory">Sicklecell\nConfirmatory</string>
|
<string name="sicklecell_nconfirmatory">Sicklecell\nConfirmatory</string>
|
||||||
<string name="sicklecell_screening">Sicklecell Screening</string>
|
<string name="sicklecell_screening">Sicklecell Screening</string>
|
||||||
<string name="thalassemia">Thalassemia</string>
|
<string name="thalassemia">Thalassemia</string>
|
||||||
|
|||||||
@@ -0,0 +1,55 @@
|
|||||||
|
package com.example.hpostesting
|
||||||
|
|
||||||
|
import android.content.SharedPreferences
|
||||||
|
import com.example.hpostesting.presentation.assurance.AssuranceControlsFragment
|
||||||
|
import junit.framework.TestCase.assertEquals
|
||||||
|
import org.junit.Before
|
||||||
|
import org.junit.Test
|
||||||
|
import org.mockito.Mock
|
||||||
|
import org.mockito.MockitoAnnotations
|
||||||
|
|
||||||
|
class AssuranceControlsFragmentTest {
|
||||||
|
@Mock
|
||||||
|
lateinit var sharedPreferences: SharedPreferences
|
||||||
|
|
||||||
|
private lateinit var assuranceControlsFragment: AssuranceControlsFragment
|
||||||
|
|
||||||
|
@Before
|
||||||
|
fun setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this)
|
||||||
|
assuranceControlsFragment = AssuranceControlsFragment()
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Test
|
||||||
|
// fun testInitViews() {
|
||||||
|
// val fragmentScenario = FragmentScenario.launchInContainer(AssuranceControlsFragment::class.java)
|
||||||
|
//
|
||||||
|
// fragmentScenario.onFragment { fragment ->
|
||||||
|
// // Mock the shared preferences
|
||||||
|
// `when`(fragment.requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)).thenReturn(sharedPreferences)
|
||||||
|
//
|
||||||
|
// // Mock the solution spinner selection
|
||||||
|
// fragment.binding.spinnerSolutions.setSelection(1)
|
||||||
|
//
|
||||||
|
// // Verify that DataHolder.hemoCubeTestData!!.solution is set correctly
|
||||||
|
// assertEquals("KMnO4", DataHolder.hemoCubeTestData!!.solution)
|
||||||
|
//
|
||||||
|
// // You can similarly test other parts of initViews() based on your requirements
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testGetPositionOfValue() {
|
||||||
|
val fragment = AssuranceControlsFragment()
|
||||||
|
|
||||||
|
val testData = listOf("Select solution", "KMnO4", "Tartrazine", "AR", "HB", "Blood")
|
||||||
|
|
||||||
|
// Test a value that exists in the list
|
||||||
|
val positionKMnO4 = fragment.getPositionOfValue("KMnO4", testData)
|
||||||
|
assertEquals(1, positionKMnO4)
|
||||||
|
|
||||||
|
// Test a value that does not exist in the list
|
||||||
|
val positionNonExistent = fragment.getPositionOfValue("NonExistent", testData)
|
||||||
|
assertEquals(0, positionNonExistent)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
package com.example.hpostesting
|
||||||
|
|
||||||
|
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
|
||||||
|
import androidx.lifecycle.Observer
|
||||||
|
import com.example.hpostesting.data.Result
|
||||||
|
import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
|
||||||
|
import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
|
||||||
|
import com.example.hpostesting.data.repository.Repository
|
||||||
|
import com.example.hpostesting.presentation.deviceprovision.DeviceProvisionViewModel
|
||||||
|
import com.example.hpostesting.util.TestCoroutineRule
|
||||||
|
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||||
|
import kotlinx.coroutines.test.runBlockingTest
|
||||||
|
import org.junit.After
|
||||||
|
import org.junit.Before
|
||||||
|
import org.junit.Rule
|
||||||
|
import org.junit.Test
|
||||||
|
import org.mockito.Mock
|
||||||
|
import org.mockito.Mockito
|
||||||
|
import org.mockito.MockitoAnnotations
|
||||||
|
|
||||||
|
@ExperimentalCoroutinesApi
|
||||||
|
class DeviceProvisionViewModelTest {
|
||||||
|
|
||||||
|
// Rule to make LiveData updates instant
|
||||||
|
@get:Rule
|
||||||
|
val instantExecutorRule = InstantTaskExecutorRule()
|
||||||
|
|
||||||
|
// Rule for testing coroutines
|
||||||
|
@get:Rule
|
||||||
|
val coroutineRule = TestCoroutineRule()
|
||||||
|
|
||||||
|
// Mocks
|
||||||
|
@Mock
|
||||||
|
private lateinit var databaseRepository: Repository
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private lateinit var deviceProvisionObserver: Observer<Result<DeviceProvisionResponse>>
|
||||||
|
|
||||||
|
// Class under test
|
||||||
|
private lateinit var viewModel: DeviceProvisionViewModel
|
||||||
|
|
||||||
|
@Before
|
||||||
|
fun setUp() {
|
||||||
|
MockitoAnnotations.openMocks(this)
|
||||||
|
viewModel = DeviceProvisionViewModel(databaseRepository)
|
||||||
|
viewModel.deviceProvisionResponse.observeForever(deviceProvisionObserver)
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
fun tearDown() {
|
||||||
|
viewModel.deviceProvisionResponse.removeObserver(deviceProvisionObserver)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `deviceProvision success`() = coroutineRule.runBlockingTest {
|
||||||
|
// Arrange
|
||||||
|
val deviceProvisionRequest = DeviceProvisionRequest(/* provide necessary parameters */)
|
||||||
|
val expectedResult = Result.Success(DeviceProvisionResponse(/* provide necessary response data */))
|
||||||
|
Mockito.`when`(databaseRepository.deviceProvision(deviceProvisionRequest)).thenReturn(expectedResult)
|
||||||
|
|
||||||
|
// Act
|
||||||
|
viewModel.deviceProvision(deviceProvisionRequest)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
// Mockito.verify(deviceProvisionObserver, Mockito.timeout(1000)).onChanged(Result.Loading())
|
||||||
|
Mockito.verify(deviceProvisionObserver, Mockito.timeout(1000)).onChanged(expectedResult)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `deviceProvision error`() = coroutineRule.runBlockingTest {
|
||||||
|
// Arrange
|
||||||
|
val deviceProvisionRequest = DeviceProvisionRequest(/* provide necessary parameters */)
|
||||||
|
val expectedError = Result.Error(Exception("Test error"))
|
||||||
|
Mockito.`when`(databaseRepository.deviceProvision(deviceProvisionRequest)).thenReturn(expectedError)
|
||||||
|
|
||||||
|
// Act
|
||||||
|
viewModel.deviceProvision(deviceProvisionRequest)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
// Mockito.verify(deviceProvisionObserver, Mockito.timeout(1000)).onChanged(Result.Loading())
|
||||||
|
Mockito.verify(deviceProvisionObserver, Mockito.timeout(1000)).onChanged(expectedError)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
package com.example.hpostesting
|
||||||
|
|
||||||
|
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
|
||||||
|
import androidx.lifecycle.Observer
|
||||||
|
import com.example.hpostesting.data.model.Response
|
||||||
|
import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
|
||||||
|
import com.example.hpostesting.data.repository.Repository
|
||||||
|
import com.example.hpostesting.presentation.diagnostics.DiagnosticsViewModel
|
||||||
|
import io.mockk.coEvery
|
||||||
|
import io.mockk.mockk
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
|
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||||
|
import kotlinx.coroutines.test.TestCoroutineScope
|
||||||
|
import kotlinx.coroutines.test.runBlockingTest
|
||||||
|
import kotlinx.coroutines.test.setMain
|
||||||
|
import org.junit.Before
|
||||||
|
import org.junit.Rule
|
||||||
|
import org.junit.Test
|
||||||
|
import org.mockito.Mock
|
||||||
|
import org.mockito.MockitoAnnotations
|
||||||
|
|
||||||
|
@ExperimentalCoroutinesApi
|
||||||
|
class DiagnosticsViewModelTest {
|
||||||
|
|
||||||
|
// Use this rule to swap the background executor used by the Architecture Components
|
||||||
|
@get:Rule
|
||||||
|
var instantTaskExecutorRule = InstantTaskExecutorRule()
|
||||||
|
|
||||||
|
// Use this dispatcher to control execution of coroutines in tests
|
||||||
|
private val testDispatcher = TestCoroutineDispatcher()
|
||||||
|
|
||||||
|
// Use this scope to control the execution of coroutines in tests
|
||||||
|
private val testCoroutineScope = TestCoroutineScope(testDispatcher)
|
||||||
|
|
||||||
|
// Mock Repository
|
||||||
|
private val mockRepository = mockk<Repository>()
|
||||||
|
|
||||||
|
// Mock Observer for LiveData
|
||||||
|
@Mock
|
||||||
|
private lateinit var mockObserver: Observer<String>
|
||||||
|
|
||||||
|
// Subject under test
|
||||||
|
private lateinit var diagnosticsViewModel: DiagnosticsViewModel
|
||||||
|
|
||||||
|
@Before
|
||||||
|
fun setup() {
|
||||||
|
// Initialize mocks
|
||||||
|
MockitoAnnotations.openMocks(this)
|
||||||
|
|
||||||
|
// Create the ViewModel with the mock repository and set the coroutine dispatcher
|
||||||
|
diagnosticsViewModel = DiagnosticsViewModel(repository = mockRepository)
|
||||||
|
// diagnosticsViewModel.viewModelScope = testCoroutineScope
|
||||||
|
|
||||||
|
// Observe the LiveData
|
||||||
|
// diagnosticsViewModel.fireBaseUpload.observeForever(mockObserver)
|
||||||
|
|
||||||
|
Dispatchers.setMain(TestCoroutineDispatcher())
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `test addDiagnosticsDataToDb success`() = runBlocking {
|
||||||
|
// Given
|
||||||
|
val diagnosticsData = mockk<DiagnosticsData>()
|
||||||
|
coEvery { mockRepository.addDiagnostics(diagnosticsData) } returns Response.Success("Success")
|
||||||
|
|
||||||
|
// When
|
||||||
|
diagnosticsViewModel.addDiagnosticsDataToDb(diagnosticsData)
|
||||||
|
|
||||||
|
// Then
|
||||||
|
assert(diagnosticsViewModel.fireBaseUpload.value == "Success")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `addDiagnosticsDataToDb error`() = testCoroutineScope.runBlockingTest {
|
||||||
|
// Given
|
||||||
|
coEvery { mockRepository.addDiagnostics(any()) } returns Response.Error(Exception("Test error"))
|
||||||
|
|
||||||
|
// When
|
||||||
|
diagnosticsViewModel.addDiagnosticsDataToDb(mockk())
|
||||||
|
|
||||||
|
// Then
|
||||||
|
assert(diagnosticsViewModel.fireBaseUpload.value == "Error")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,10 +1,13 @@
|
|||||||
package com.example.hpostesting
|
package com.example.hpostesting
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
|
import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
|
||||||
import com.example.hpostesting.presentation.hemocube.HemocubeActivity
|
import com.example.hpostesting.presentation.hemocube.HemocubeActivity
|
||||||
import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
|
import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
|
||||||
import junit.framework.TestCase
|
import junit.framework.TestCase
|
||||||
|
import junit.framework.TestCase.assertEquals
|
||||||
|
import junit.framework.TestCase.assertNull
|
||||||
import org.junit.Before
|
import org.junit.Before
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
import org.mockito.ArgumentMatchers
|
import org.mockito.ArgumentMatchers
|
||||||
@@ -14,6 +17,9 @@ import org.mockito.MockitoAnnotations
|
|||||||
|
|
||||||
class HemoCubeFragmentTest {
|
class HemoCubeFragmentTest {
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
lateinit var mockContext: Context
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
private lateinit var mockSharedPreferences: SharedPreferences
|
private lateinit var mockSharedPreferences: SharedPreferences
|
||||||
|
|
||||||
@@ -32,7 +38,7 @@ class HemoCubeFragmentTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `extractMiddleString to get device id`() {
|
fun `extractV2HardwareId to get device id`() {
|
||||||
// Arrange
|
// Arrange
|
||||||
Mockito.`when`(
|
Mockito.`when`(
|
||||||
mockSharedPreferences.getString(
|
mockSharedPreferences.getString(
|
||||||
@@ -42,7 +48,7 @@ class HemoCubeFragmentTest {
|
|||||||
).thenReturn("dummy_value")
|
).thenReturn("dummy_value")
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
val deviceId = hemoCubeFragment.extractMiddleString("SNS HPP1-9000 SNE")
|
val deviceId = hemoCubeFragment.extractV2HardwareId("SNS HPP1-9000 SNE")
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
TestCase.assertEquals("HPP1-9000", deviceId)
|
TestCase.assertEquals("HPP1-9000", deviceId)
|
||||||
@@ -81,4 +87,274 @@ class HemoCubeFragmentTest {
|
|||||||
TestCase.assertEquals(true, result)
|
TestCase.assertEquals(true, result)
|
||||||
TestCase.assertEquals(hemoCubeFragment.allReadingsComplete(0, 1), false)
|
TestCase.assertEquals(hemoCubeFragment.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 = hemoCubeFragment.extractV1HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
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 = hemoCubeFragment.extractV1HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertNull(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV1HardwareId should return null when input is empty`() {
|
||||||
|
// Arrange
|
||||||
|
val input = ""
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = hemoCubeFragment.extractV1HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertNull(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV1HardwareId should return null when input is null`() {
|
||||||
|
// Arrange
|
||||||
|
val input: String? = null
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = input?.let { hemoCubeFragment.extractV1HardwareId(it) }
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
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 = hemoCubeFragment.extractV1HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
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 = hemoCubeFragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
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 = hemoCubeFragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertNull(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `extractV2HardwareId should handle whitespace around the hardware ID`() {
|
||||||
|
// Arrange
|
||||||
|
val input = "SNS XYZ789 SNE"
|
||||||
|
|
||||||
|
// Act
|
||||||
|
val result = hemoCubeFragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
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 = hemoCubeFragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
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 = hemoCubeFragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
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 = hemoCubeFragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
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 = hemoCubeFragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
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 = hemoCubeFragment.extractV2HardwareId(input)
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertEquals("HPP-000-5001", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeviceRatioClassificationNormal() {
|
||||||
|
val ratio = 0.25
|
||||||
|
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
||||||
|
assertEquals("Normal", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeviceRatioClassificationNegativeBorderline() {
|
||||||
|
val ratio = 0.31
|
||||||
|
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
||||||
|
assertEquals("Negative Borderline, Repeat Test", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeviceRatioClassificationSickleCellTrait() {
|
||||||
|
val ratio = 0.34
|
||||||
|
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
||||||
|
assertEquals("Sickle Cell Trait", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeviceRatioClassificationPositiveForSickleCell() {
|
||||||
|
val ratio = 0.37
|
||||||
|
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
||||||
|
assertEquals("Positive for Sickle Cell. HPLC for Confirmation", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeviceRatioClassificationSickleCellDisease() {
|
||||||
|
val ratio = 0.45
|
||||||
|
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
||||||
|
assertEquals("Sickle Cell Disease", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeviceRatioClassificationInvalid() {
|
||||||
|
val ratio: Double? = null
|
||||||
|
val result = hemoCubeFragment.deviceRatioClassification(ratio)
|
||||||
|
assertEquals("Invalid", result)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,27 +1,20 @@
|
|||||||
package com.example.hpostesting
|
package com.example.hpostesting
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.os.Build
|
|
||||||
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
|
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
|
||||||
import androidx.lifecycle.Observer
|
import androidx.lifecycle.Observer
|
||||||
import androidx.work.Configuration
|
|
||||||
import androidx.work.testing.SynchronousExecutor
|
|
||||||
import androidx.work.testing.WorkManagerTestInitHelper
|
|
||||||
import com.example.hpostesting.data.Result
|
import com.example.hpostesting.data.Result
|
||||||
import com.example.hpostesting.data.model.login.LoginResponse
|
import com.example.hpostesting.data.model.login.LoginResponse
|
||||||
import com.example.hpostesting.data.repository.Repository
|
import com.example.hpostesting.data.repository.Repository
|
||||||
import com.example.hpostesting.domain.LogFileManager
|
import com.example.hpostesting.domain.LogFileManager
|
||||||
import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
|
import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
|
||||||
import com.example.hpostesting.util.TestCoroutineRule
|
import com.example.hpostesting.util.TestCoroutineRule
|
||||||
import io.mockk.MockKAnnotations
|
|
||||||
import io.mockk.coEvery
|
|
||||||
import io.mockk.coVerify
|
|
||||||
import io.mockk.every
|
import io.mockk.every
|
||||||
import io.mockk.impl.annotations.MockK
|
import io.mockk.impl.annotations.MockK
|
||||||
import io.mockk.mockk
|
import io.mockk.mockk
|
||||||
import io.mockk.verify
|
import io.mockk.verify
|
||||||
|
import junit.framework.TestCase
|
||||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||||
import kotlinx.coroutines.test.runBlockingTest
|
|
||||||
import org.junit.After
|
import org.junit.After
|
||||||
import org.junit.Before
|
import org.junit.Before
|
||||||
import org.junit.Rule
|
import org.junit.Rule
|
||||||
@@ -29,35 +22,34 @@ import org.junit.Test
|
|||||||
import org.junit.runner.RunWith
|
import org.junit.runner.RunWith
|
||||||
import org.robolectric.RobolectricTestRunner
|
import org.robolectric.RobolectricTestRunner
|
||||||
import org.robolectric.annotation.Config
|
import org.robolectric.annotation.Config
|
||||||
import java.io.File
|
|
||||||
|
|
||||||
//@RunWith(RobolectricTestRunner::class)
|
@RunWith(RobolectricTestRunner::class)
|
||||||
//@Config(manifest = Config.NONE)
|
@Config(manifest = Config.NONE)
|
||||||
//@ExperimentalCoroutinesApi
|
@ExperimentalCoroutinesApi
|
||||||
//class HemocubeViewModelTest {
|
class HemocubeViewModelTest {
|
||||||
//
|
|
||||||
// @get:Rule
|
@get:Rule
|
||||||
// val instantTaskExecutorRule = InstantTaskExecutorRule()
|
val instantTaskExecutorRule = InstantTaskExecutorRule()
|
||||||
//
|
|
||||||
// @get:Rule
|
@get:Rule
|
||||||
// val coroutineRule = TestCoroutineRule()
|
val coroutineRule = TestCoroutineRule()
|
||||||
//
|
|
||||||
// @MockK(relaxed = true)
|
@MockK(relaxed = true)
|
||||||
// lateinit var repository: Repository
|
lateinit var repository: Repository
|
||||||
//
|
|
||||||
// @MockK(relaxed = true)
|
@MockK(relaxed = true)
|
||||||
// lateinit var logFileManager: LogFileManager
|
lateinit var logFileManager: LogFileManager
|
||||||
//
|
|
||||||
// @MockK(relaxed = true)
|
@MockK(relaxed = true)
|
||||||
// lateinit var context: Context
|
lateinit var context: Context
|
||||||
//
|
|
||||||
// @MockK(relaxed = true)
|
@MockK(relaxed = true)
|
||||||
// lateinit var observer: Observer<Result<LoginResponse>>
|
lateinit var observer: Observer<Result<LoginResponse>>
|
||||||
//
|
|
||||||
// private lateinit var viewModel: HemoCubeViewModel
|
private lateinit var viewModel: HemoCubeViewModel
|
||||||
//
|
|
||||||
// @Before
|
@Before
|
||||||
// fun setup() {
|
fun setup() {
|
||||||
// MockKAnnotations.init(this)
|
// MockKAnnotations.init(this)
|
||||||
//
|
//
|
||||||
// val config = Configuration.Builder()
|
// val config = Configuration.Builder()
|
||||||
@@ -78,13 +70,34 @@ import java.io.File
|
|||||||
// context
|
// context
|
||||||
// )
|
// )
|
||||||
// viewModel.loginResponse.observeForever(observer)
|
// viewModel.loginResponse.observeForever(observer)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// @After
|
@After
|
||||||
// fun teardown() {
|
fun teardown() {
|
||||||
// viewModel.loginResponse.removeObserver(observer)
|
// viewModel.loginResponse.removeObserver(observer)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
|
@Test
|
||||||
|
fun `testAddNumbers in HemocubeViewModelTest`() {
|
||||||
|
// Create a mock of the Calculator class using Mockito-Kotlin
|
||||||
|
val calculatorMock = mockk<Calculator>()
|
||||||
|
|
||||||
|
// Define the behavior of the add method on the mock
|
||||||
|
every { calculatorMock.add(2, 3) } returns 5
|
||||||
|
|
||||||
|
// Create an instance of MathApplication with the mock Calculator
|
||||||
|
val mathApplication = MathApplication(calculatorMock)
|
||||||
|
|
||||||
|
// Perform the test using the MathApplication
|
||||||
|
val result = mathApplication.addNumbers(2, 3)
|
||||||
|
|
||||||
|
// Verify that the add method of the mock was called with the correct parameters
|
||||||
|
verify { calculatorMock.add(2, 3) }
|
||||||
|
|
||||||
|
// Verify the result of the test
|
||||||
|
TestCase.assertEquals(5, result)
|
||||||
|
}
|
||||||
|
|
||||||
// @Test
|
// @Test
|
||||||
// fun `login() should update LiveData with success`() = coroutineRule.runBlockingTest {
|
// fun `login() should update LiveData with success`() = coroutineRule.runBlockingTest {
|
||||||
//
|
//
|
||||||
@@ -124,7 +137,7 @@ import java.io.File
|
|||||||
// viewModel.uploadLogs()
|
// viewModel.uploadLogs()
|
||||||
//
|
//
|
||||||
// // Assert
|
// // Assert
|
||||||
// verify { observer.onChanged(response) }
|
// verify { observer.onChanged(response as Result<LoginResponse>) }
|
||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
// @Test
|
// @Test
|
||||||
@@ -141,4 +154,4 @@ import java.io.File
|
|||||||
// // Assert
|
// // Assert
|
||||||
// verify { observer.onChanged(response) }
|
// verify { observer.onChanged(response) }
|
||||||
// }
|
// }
|
||||||
//}
|
}
|
||||||
15
app/src/test/java/com/example/hpostesting/MathApplication.kt
Normal file
15
app/src/test/java/com/example/hpostesting/MathApplication.kt
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
package com.example.hpostesting
|
||||||
|
|
||||||
|
|
||||||
|
class Calculator {
|
||||||
|
fun add(a: Int, b: Int): Int {
|
||||||
|
return a + b
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class MathApplication(private val calculator: Calculator) {
|
||||||
|
fun addNumbers(a: Int, b: Int): Int {
|
||||||
|
return calculator.add(a, b)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package com.example.hpostesting
|
||||||
|
|
||||||
|
import io.mockk.every
|
||||||
|
import io.mockk.mockk
|
||||||
|
import io.mockk.verify
|
||||||
|
import junit.framework.TestCase.assertEquals
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
class MathApplicationTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testAddNumbers() {
|
||||||
|
// Create a mock of the Calculator class using Mockito-Kotlin
|
||||||
|
val calculatorMock = mockk<Calculator>()
|
||||||
|
|
||||||
|
// Define the behavior of the add method on the mock
|
||||||
|
every { calculatorMock.add(2, 3) } returns 5
|
||||||
|
|
||||||
|
// Create an instance of MathApplication with the mock Calculator
|
||||||
|
val mathApplication = MathApplication(calculatorMock)
|
||||||
|
|
||||||
|
// Perform the test using the MathApplication
|
||||||
|
val result = mathApplication.addNumbers(2, 3)
|
||||||
|
|
||||||
|
// Verify that the add method of the mock was called with the correct parameters
|
||||||
|
verify { calculatorMock.add(2, 3) }
|
||||||
|
|
||||||
|
// Verify the result of the test
|
||||||
|
assertEquals(5, result)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
package com.example.hpostesting
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.net.ConnectivityManager
|
||||||
|
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
|
||||||
|
import io.mockk.every
|
||||||
|
import io.mockk.mockk
|
||||||
|
import io.mockk.verify
|
||||||
|
import junit.framework.TestCase
|
||||||
|
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 NetworkStatusLiveDataTest {
|
||||||
|
@get:Rule
|
||||||
|
val instantTaskExecutorRule = InstantTaskExecutorRule()
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private lateinit var mockContext: Context
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private lateinit var mockConnectivityManager: ConnectivityManager
|
||||||
|
|
||||||
|
@Before
|
||||||
|
fun setUp() {
|
||||||
|
// mockContext = ApplicationProvider.getApplicationContext<Context>()
|
||||||
|
// mockConnectivityManager = mockContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testAddNumbers() {
|
||||||
|
// Create a mock of the Calculator class using Mockito-Kotlin
|
||||||
|
val calculatorMock = mockk<Calculator>()
|
||||||
|
|
||||||
|
// Define the behavior of the add method on the mock
|
||||||
|
every { calculatorMock.add(2, 3) } returns 5
|
||||||
|
|
||||||
|
// Create an instance of MathApplication with the mock Calculator
|
||||||
|
val mathApplication = MathApplication(calculatorMock)
|
||||||
|
|
||||||
|
// Perform the test using the MathApplication
|
||||||
|
val result = mathApplication.addNumbers(2, 3)
|
||||||
|
|
||||||
|
// Verify that the add method of the mock was called with the correct parameters
|
||||||
|
verify { calculatorMock.add(2, 3) }
|
||||||
|
|
||||||
|
// Verify the result of the test
|
||||||
|
TestCase.assertEquals(5, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Test
|
||||||
|
// fun testNetworkStatusLiveData() {
|
||||||
|
// // Assuming mockConnectivityManager is a mocked ConnectivityManager instance
|
||||||
|
// val mockNetwork = mock(Network::class.java)
|
||||||
|
// val mockNetworkCapabilities = mock(NetworkCapabilities::class.java)
|
||||||
|
//
|
||||||
|
// // Define desired capabilities
|
||||||
|
// `when`(mockNetworkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)).thenReturn(true)
|
||||||
|
// `when`(mockNetworkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)).thenReturn(true)
|
||||||
|
//
|
||||||
|
// // Set up network to return mocked capabilities
|
||||||
|
// `when`(mockConnectivityManager.activeNetwork).thenReturn(mockNetwork)
|
||||||
|
// `when`(mockConnectivityManager.getNetworkCapabilities(mockNetwork)).thenReturn(mockNetworkCapabilities)
|
||||||
|
//
|
||||||
|
// // Act
|
||||||
|
// val networkStatusLiveData = NetworkStatusLiveData(mockContext)
|
||||||
|
// val isConnected = networkStatusLiveData.value
|
||||||
|
//
|
||||||
|
// // Assert
|
||||||
|
// assertTrue("Network should be connected", isConnected!!)
|
||||||
|
// }
|
||||||
|
}
|
||||||
Binary file not shown.
2
barcode_scanner_library_v2.0.8.0/build.gradle
Normal file
2
barcode_scanner_library_v2.0.8.0/build.gradle
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
configurations.maybeCreate("default")
|
||||||
|
artifacts.add("default", file('barcode_scanner_library_v2.0.8.0.aar'))
|
||||||
Reference in New Issue
Block a user