From f50a1d8dcd76afd4f66fa9662284d7e030a8ab9b Mon Sep 17 00:00:00 2001
From: Kaif <mohamedkaif@sminnovations.in>
Date: Sun, 24 Dec 2023 23:12:22 +0530
Subject: [PATCH] Added all for values and rebase with preprod

---
 .idea/gradle.xml                                   |  1 +
 app/build.gradle                                   |  4 ++--
 .../example/hpostesting/data/constant/Constants.kt | 14 ++++++++++----
 .../presentation/hemocube/HemoCubeFragment.kt      | 14 +++++++++++---
 .../res/layout/fragment_hemo_cube_reference.xml    |  7 ++++---
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cb865f6..9f47dfb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
diff --git a/app/build.gradle b/app/build.gradle
index c3d374d..df72036 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
         applicationId "in.sminnovations.hpostesting.quality"
         minSdk 21
         targetSdk 34
-        versionCode 56
-        versionName "2.1.56"
+        versionCode 60
+        versionName "2.1.61"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
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 1a68290..e03d945 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
@@ -107,6 +107,12 @@ object Constants {
             listOf(0.1964, 0.011565),           // LED3, 555nm
             listOf(1.0, 0.0)                    // LED4, 560nm
         ),
+        "HCV-000-3003" 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, 560nm
+        ),
     )
 
     val DEVICE_HB_PARAMETERS: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
@@ -123,10 +129,10 @@ object Constants {
             listOf(0.0258, 0.5534)                  // LED4, 560nm
         ),
         "HCV-000-3003" 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(0.0562, 0.1001),         // LED1, 435nm
+            listOf(0.0902, 0.7021),      // LED2, 415nm
+            listOf(0.0192, 0.019),           // LED3, 555nm
+            listOf(0.0153, 0.0152)                    // LED4
         ),
         "HCV-000-3004" to listOf(
             listOf(1.6837, -1.1417),         // LED1, 435nm
diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
index cc677e4..054bdcf 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -498,10 +498,18 @@ class HemoCubeFragment : Fragment() {
             constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(2)?.get(1)
             fittedAbs3 = gradient?.times(led3Average)?.plus(constant!!)!!
 
-            gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(3)?.get(0)
-            constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(3)?.get(1)
+            gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(0)?.get(0)
+            constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(0)?.get(1)
             fittedAbs4 = gradient?.times(led4Average)?.plus(constant!!)!!
 
+            val slope1 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(1)?.get(0)
+            val intercept1 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(1)?.get(1)
+            val _hb1 = (led3Average - intercept1!!) / slope1!!
+
+            val slope2 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(0)
+            val intercept = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(1)
+            val _hb2 = (led4Average - intercept!!) / slope2!!
+
             val slope3 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(2)?.get(0)
             val intercept3 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(2)?.get(1)
             val _hb3 = (led3Average - intercept3!!) / slope3!!
@@ -566,7 +574,7 @@ class HemoCubeFragment : Fragment() {
                     .toString() + ", " + currentDeviceData?.coefficients?.get(1).toString()
                 this.classificationResult = findResult(calculatedRatio)
                 this.prdClassification = absorbanceBasedClassification(predictedDenovixRatio)
-                hemoCubeViewModel.messages.postValue("Hb3: $_hb3,\n Hb4: $_hb4")
+                hemoCubeViewModel.messages.postValue("Hb1: $_hb1,\nHb2: $_hb2,\nHb3: $_hb3,\n Hb4: $_hb4")
                 this.errorMessages = allErrorMessages
                 this.resultData = deviceLog
                 this.batteryLevel = hemoCubeViewModel.getBatteryLevel().toString()
diff --git a/app/src/main/res/layout/fragment_hemo_cube_reference.xml b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
index 9b166f9..e7c288b 100644
--- a/app/src/main/res/layout/fragment_hemo_cube_reference.xml
+++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
@@ -62,7 +62,7 @@
             android:id="@+id/tv_subtitle4"
             style="@style/title1_1"
             android:layout_width="0dp"
-            android:layout_height="80dp"
+            android:layout_height="wrap_content"
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="72dp"
             android:gravity="center"
@@ -208,14 +208,15 @@
         <TextView
             android:id="@+id/tv_device_messages"
             style="@style/title1_1"
-            android:visibility="gone"
             android:layout_width="0dp"
-            android:layout_height="180dp"
+            android:layout_height="0dp"
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="72dp"
             android:gravity="center"
             android:textColor="@color/black"
             android:textSize="11sp"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/error_message" />