app version 130.2, default remote config values updated

app/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "in.sminnovations.hpostesting.server"
         minSdk 21
         targetSdk 34
-        versionCode 130
-        versionName "2.1.130"
+        versionCode 132
+        versionName "2.1.130.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

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

@@ -145,19 +145,22 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         val time = timeDifference(sharedPreference.getString(Constants.KIT_TIME, "").toString())
         val kitNum = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
        // Toast.makeText(this@KitScanActivity,"Test MAx time"+ time+"-Test count-"+kitNum,Toast.LENGTH_SHORT).show()
-
-        if (DataHolder.sampleReadCounter <= maxTest && kitNum != "" && time < Constants.MAX_KIT_TIME) {
+        if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
             moveToNext()
-        } else {
-            Toast.makeText(this@KitScanActivity, "Limit Reached, Use New KIT for testing", Toast.LENGTH_SHORT).show()
-            DataHolder.sampleReadCounter = 0
-            DataHolder.kitSerial = ""
+        }else{
+            if (DataHolder.sampleReadCounter <= maxTest && kitNum != "" && time < Constants.MAX_KIT_TIME) {
+                moveToNext()
+            } else {
+                Toast.makeText(this@KitScanActivity, "Limit Reached, Use New KIT for testing", Toast.LENGTH_SHORT).show()
+                DataHolder.sampleReadCounter = 0
+                DataHolder.kitSerial = ""
 
-            with(sharedPreference.edit()) {
-                putString(Constants.KIT_NUMBER, "")
-                putString(Constants.BUFFER_VALUE_1, "")
-                putString(Constants.BUFFER_VALUE_2, "")
-                apply()
+                with(sharedPreference.edit()) {
+                    putString(Constants.KIT_NUMBER, "")
+                    putString(Constants.BUFFER_VALUE_1, "")
+                    putString(Constants.BUFFER_VALUE_2, "")
+                    apply()
+                }
             }
         }
 

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

@@ -1468,21 +1468,21 @@ class HemoCubeFragment : Fragment() {
             if (deviceRatio != null && borderlineMetric != null) {
                 if(cuvetteSize == "10mm"){
                     if (deviceRatioClass == "Negative Borderline") {
-                        if (borderlineMetric < negativeBoderLine10mm1){//1.34
+                        if (borderlineMetric < negativeBoderLine10mm1){//2.0
                             return "Sickle Cell Trait"
-                        }else if(borderlineMetric > negativeBoderLine10mm2){
+                        }else if(borderlineMetric > negativeBoderLine10mm1){
                             return "Normal"
-                        }else if(borderlineMetric > negativeBoderLine10mm1 && borderlineMetric < negativeBoderLine10mm2){
-                            return "Negative borderline. Confirm with HPLC"
+                        }else if(borderlineMetric == negativeBoderLine10mm1){//borderlineMetric > negativeBoderLine10mm1 && borderlineMetric < negativeBoderLine10mm2
+                            return "Sickle Cell Trait"//"Negative borderline. Confirm with HPLC"
                         }
                     }
                     if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
-                        if (borderlineMetric < positiveBoderLine10mm1){//1.34
+                        if (borderlineMetric < positiveBoderLine10mm1){//1.3
                             return "Sickle Cell Disease"
-                        }else if(borderlineMetric > positiveBoderLine10mm2){
+                        }else if(borderlineMetric > positiveBoderLine10mm1){
                             return "Sickle Cell Trait"
-                        }else if(borderlineMetric > positiveBoderLine10mm1 && borderlineMetric < positiveBoderLine10mm2){
-                            return "Positive for Sickle Cell. Confirm with HPLC"
+                        }else if(borderlineMetric == positiveBoderLine10mm1){//borderlineMetric > positiveBoderLine10mm1 && borderlineMetric < positiveBoderLine10mm2
+                            return "Sickle Cell Disease"//"Positive for Sickle Cell. Confirm with HPLC"
                         }
                     }
                 }else if(cuvetteSize == "2mm"){

app/src/main/res/xml/remote_config_defaults.xml

@@ -33,7 +33,7 @@
     </entry>
     <entry>
         <key>normalMin10mm</key>
-        <value>0.1</value>
+        <value>0.07</value>
     </entry>
     <entry>
         <key>normalMax10mm</key>
@@ -45,11 +45,11 @@
     </entry>
     <entry>
         <key>negativeBorderlineMax10mm</key>
-        <value>0.25</value>
+        <value>0.27</value>
     </entry>
     <entry>
         <key>sickleCellTraitMin10mm</key>
-        <value>0.25</value>
+        <value>0.27</value>
     </entry>
     <entry>
         <key>sickleCellTraitMax10mm</key>
@@ -61,11 +61,11 @@
     </entry>
     <entry>
         <key>positiveForSickleCellMax10mm</key>
-        <value>0.43</value>
+        <value>0.39</value>
     </entry>
     <entry>
         <key>sickleCellDiseaseMin10mm</key>
-        <value>0.43</value>
+        <value>0.39</value>
     </entry>
     <entry>
         <key>sickleCellDiseaseMax10mm</key>

app/src/test/java/com/example/hpostesting/HemoCubeFragmentTest.kt

@@ -390,7 +390,7 @@ class HemoCubeFragmentTest {
     fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellTrait1() {
         val result =
             hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.2)
-        assertEquals("Negative borderline. Confirm with HPLC", result)
+        assertEquals("Normal", result)
     }
 
     @Test
@@ -400,7 +400,7 @@ class HemoCubeFragmentTest {
             "Positive for Sickle Cell. HPLC for Confirmation",
             1.4
         )
-        assertEquals("Positive for Sickle Cell. Confirm with HPLC", result)
+        assertEquals("Sickle Cell Trait", result)
     }
 
     @Test
@@ -410,7 +410,7 @@ class HemoCubeFragmentTest {
             "Positive for Sickle Cell. HPLC for Confirmation",
             1.33
         )
-        assertEquals("Positive for Sickle Cell. Confirm with HPLC", result)
+        assertEquals("Sickle Cell Trait", result)
     }
 
     @Test