diff --git a/app/build.gradle b/app/build.gradle index 0a45e20..c3d374d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ android { // prod - production, preprod - preproduction, quality - qc defaultConfig { - applicationId "in.sminnovations.hpostesting" + applicationId "in.sminnovations.hpostesting.quality" minSdk 21 targetSdk 34 versionCode 56 diff --git a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt index fed9211..1a68290 100644 --- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt +++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt @@ -99,13 +99,28 @@ object Constants { listOf(1.313, -0.89), // LED1, 435nm listOf(0.581462456, -0.58502), // LED2, 415nm listOf(0.2012, 0.0092), // LED3, 555nm - listOf(1.0, 0.0) // LED4 + listOf(1.0, 0.0) // LED4, 560nm ), "HCV-000-3002" to listOf( listOf(0.723142, -0.09135), // LED1, 435nm listOf(0.581462456, -0.58502), // LED2, 415nm listOf(0.1964, 0.011565), // LED3, 555nm - listOf(1.0, 0.0) // LED4 + listOf(1.0, 0.0) // LED4, 560nm + ), + ) + + val DEVICE_HB_PARAMETERS: Map>> = mapOf>>( + "HCV-000-3001" to listOf( + listOf(1.0, 0.0), // LED1, 435nm + listOf(1.0, 0.0), // LED2, 415nm + listOf(0.0305, 0.2067), // LED3, 555nm + listOf(0.0258, 0.5534) // LED4, 560nm + ), + "HCV-000-3002" to listOf( + listOf(1.0, 0.0), // LED1, 435nm + listOf(1.0, 0.0), // LED2, 415nm + listOf(0.0305, 0.2067), // LED3, 555nm + listOf(0.0258, 0.5534) // LED4, 560nm ), "HCV-000-3003" to listOf( listOf(0.723142, -0.09135), // LED1, 435nm @@ -125,6 +140,8 @@ object Constants { const val INCUBATION_TIME_MAX = 1400 const val BATTERY_LEVEL_MIN = 0 + const val MINIMUM_BATTERY_LEVEL = 0 + val BUFFER_INTENSITY_THRESHOLDS: Map>> = mapOf>>( "HCV-000-3001" to listOf( listOf(20000, 25074), diff --git a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt index b3b9338..e0034c0 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt @@ -26,7 +26,6 @@ import android.widget.AutoCompleteTextView import androidx.core.content.ContextCompat.getSystemService import androidx.core.content.getSystemService import androidx.fragment.app.FragmentActivity -import com.example.hpostesting.data.constant.Constants import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel import com.google.firebase.firestore.FirebaseFirestore @@ -197,7 +196,7 @@ class UserListAdapter( // } } userCard.setOnClickListener { - if (batLevel < Constants.BATTERY_LEVEL_MIN) { + if (batLevel < 40) { Toast.makeText( view.context, context?.getString(R.string.low_battery_warning),