Merge remote-tracking branch 'origin/preprod' into preprod

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "in.sminnovations.hpostesting"
         minSdk 21
         targetSdk 34
-        versionCode 30
+        versionCode 35
-        versionName "2.1.30"
+        versionName "2.1.35"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -49,6 +49,9 @@ android {
         abortOnError false
         checkReleaseBuilds false
     }
+    packagingOptions {
+        exclude 'mockito-extensions/org.mockito.plugins.MockMaker'
+    }
 }
 
 dependencies {

app/src/main/java/com/example/hpostesting/data/constant/Constants.kt

@@ -80,34 +80,34 @@ object Constants {
 
     val DEVICE_CONFIGURATION: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
         "HCV-000-3001" to listOf(
-            listOf(1.264817, -0.85965),     // LED1, 435nm
+            listOf(1.313, -0.9191),         // LED1, 435nm
             listOf(0.581462456, -0.58502),  // LED2, 415nm
-            listOf(0.184991, 0.001704),     // LED3, 555nm
+            listOf(0.2012, 0.0092),         // LED3, 555nm
             listOf(1.0, 0.0)                // LED4
         ),
         "HCV-000-3002" to listOf(
-            listOf(1.264817, -0.85965),
+            listOf(0.587389, 0.0),          // LED1, 435nm
-            listOf(0.581462456, -0.58502),
+            listOf(0.581462456, -0.58502),  // LED2, 415nm
-            listOf(0.184991, 0.001704),
+            listOf(0.166459, 0.0),          // LED3, 555nm
-            listOf(1.0, 0.0)
+            listOf(1.0, 0.0)                // LED4
         ),
     )
 
-    const val INCUBATION_TIME_MIN = 15
+    const val INCUBATION_TIME_MIN = 0
-    const val INCUBATION_TIME_MAX = 30
+    const val INCUBATION_TIME_MAX = 1400
 
     val BUFFER_INTENSITY_THRESHOLDS: Map<String, List<List<Int>>> = mapOf<String, List<List<Int>>>(
         "HCV-000-3001" to listOf(
-            listOf(24000, 24500),
+            listOf(20000, 25074),
-            listOf(21000, 24500),
+            listOf(20000, 24596),
-            listOf(21000, 24500),
+            listOf(20000, 26065),
-            listOf(21000, 24500),
+            listOf(20000, 27093),
         ),
         "HCV-000-3002" to listOf(
-            listOf(21000, 24500),
+            listOf(24500, 26250),
-            listOf(21000, 24500),
+            listOf(24500, 26250),
-            listOf(21000, 24500),
+            listOf(24500, 26250),
-            listOf(21000, 24500),
+            listOf(24500, 26250),
         )
     )
 }

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

@@ -127,26 +127,20 @@ class KitScanActivity : AppCompatActivity() {
                     val i = Intent(applicationContext, DashboardActivity::class.java)
                     startActivity(i)
                     finish()
+                } else {
+                    DataHolder.kitSerial = binding.nameEditText.text.toString()
+                    DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
+                    with(sharedPreference.edit()) {
+                        putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
+                        putInt(Constants.KIT_COUNT, 1)
+                        apply()
+                    }
+                    moveToNext()
                 }
             } else {
                 Toast.makeText(this, "Invalid KIT Number", Toast.LENGTH_LONG).show()
                 return@setOnClickListener
             }
-            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(
-                    serialNumber
-                )
-            ) {
-                DataHolder.kitSerial = binding.nameEditText.text.toString()
-                DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
-                with(sharedPreference.edit()) {
-                    putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
-                    putInt(Constants.KIT_COUNT, 1)
-                    apply()
-                }
-                moveToNext()
-            } else {
-                Toast.makeText(this, "Invalid KIT Number", Toast.LENGTH_LONG).show()
-            }
         }
     }
 

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

@@ -521,14 +521,14 @@ class HemoCubeFragment : Fragment() {
                 }
             }
 
-            if (!validationError) {
+//            if (!validationError) {
                 activity?.runOnUiThread {
                     binding.btnSubmit.visibility = View.VISIBLE
                     binding.btnSubmit.isEnabled = true
                     binding.btnSubmit.isClickable = true
                     binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
                 }
-            }
+//            }
         } catch (e: Exception) {
             Toast.makeText(
                 requireContext(),