add new device ids

# Conflicts:
#	app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt

.idea/gradle.xml

@@ -4,8 +4,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
@@ -14,6 +12,7 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

app/build.gradle

@@ -14,13 +14,13 @@ android {
     compileSdk 34
     namespace 'in.sminnovations.hpostesting'
 
-    // prod - production, preprod - preproduction, quality - qc,
+    // prod - production, preprod - preproduction, quality - qc
     defaultConfig {
-        applicationId "in.sminnovations.hpostesting"
+        applicationId "in.sminnovations.hpostesting.dev"
         minSdk 21
         targetSdk 34
-        versionCode 44
+        versionCode 76
-        versionName "2.1.45"
+        versionName "2.1.76"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -29,6 +29,8 @@ object Constants {
     const val DEVICE_VENDOR_ID = 1027
     const val HOMO_CUBE_ID = 29987
     const val VENDOR_ID = 6790
+    const val HEMO_CUBE_V2_PRODUCT_ID = 24577
+    const val HEMO_CUBE_V2_VENDOR_ID = 1027
 
     const val ERROR_NORMAL = 400
     const val ERROR_CRITICAL = 401
@@ -38,6 +40,7 @@ object Constants {
     const val USER_ID = "usernameId"
 
     val STATICID = listOf(
+        "ADMIN",
         "VIZ-1000-0004",
         "VIZ-1000-0005",
         "VIZ-1000-0006",
@@ -63,6 +66,15 @@ object Constants {
         "HC-V1-020",
         "HCV-000-3001",
         "HCV-000-3002",
+        "HCV-000-3003",
+        "HCV-000-3004",
+        "HCV-000-3005",
+        "HCV-000-3006",
+        "HCV-000-3007",
+        "HCV-000-3008",
+        "HCV-000-3009",
+        "HCV-000-3010",
+        "HPP1-0124-0001"
     )
 
     const val password = "SMI@12345"
@@ -78,8 +90,21 @@ object Constants {
     const val BUFFER_LED_LOWER_BOUND = 21000
     const val BUFFER_LED_UPPER_BOUND = 24500
 
+    const val TEST_STATUS_CODE_TEST_STARTED = 1.0
+    const val TEST_STATUS_CODE_CONFIG_STARTED = 2.0
+    const val TEST_STATUS_CODE_CONFIG_COMPLETED = 3.0
+    const val TEST_STATUS_CODE_BUFFER_STARTED = 4.0
+    const val TEST_STATUS_CODE_BUFFER_COMPLETED = 5.0
+    const val TEST_STATUS_CODE_BUFFER_PRINT_STARTED = 6.0
+    const val TEST_STATUS_CODE_BUFFER_PRINT_COMPLETED = 7.0
+    const val TEST_STATUS_CODE_SAMPLE_STARTED = 8.0
+    const val TEST_STATUS_CODE_SAMPLE_COMPLETED = 9.0
+    const val TEST_STATUS_CODE_SAMPLE_PRINT_STARTED = 10.0
+    const val TEST_STATUS_CODE_SAMPLE_PRINT_COMPLETED = 11.0
+    const val TEST_STATUS_CODE_TEST_COMPLETED = 12.0
+
     val DEVICE_CONFIGURATION: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
-        "HCV-000-3001" to listOf(
+        "HPP1-0124-0001" to listOf(
             listOf(1.313, -0.89),           // LED1, 435nm
             listOf(0.581462456, -0.58502),  // LED2, 415nm
             listOf(0.2012, 0.0092),         // LED3, 555nm
@@ -91,13 +116,62 @@ object Constants {
             listOf(0.1964, 0.011565),           // LED3, 555nm
             listOf(1.0, 0.0)                    // LED4
         ),
+        "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
+        ),
+        "HCV-000-3004" to listOf(
+            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3005" to listOf(
+            listOf(1.3801, -0.372),             // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.4565, -0.0371),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3006" to listOf(
+            listOf(1.3801, -0.372),             // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.4565, -0.0371),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3007" to listOf(
+            listOf(1.8445, -0.8213),            // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.4613, -0.0831),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3008" to listOf(
+            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3009" to listOf(
+            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
+        "HCV-000-3010" to listOf(
+            listOf(1.7272, -1.1977),            // LED1, 435nm
+            listOf(0.581462456, -0.58502),      // LED2, 415nm
+            listOf(0.2304, -0.0145),            // LED3, 555nm
+            listOf(1.0, 0.0)                    // LED4
+        ),
     )
 
     const val INCUBATION_TIME_MIN = 0
     const val INCUBATION_TIME_MAX = 1400
+    const val BATTERY_LEVEL_MIN = 0
 
     val BUFFER_INTENSITY_THRESHOLDS: Map<String, List<List<Int>>> = mapOf<String, List<List<Int>>>(
-        "HCV-000-3001" to listOf(
+        "HPP1-0124-0001" to listOf(
             listOf(20000, 25074),
             listOf(20000, 24596),
             listOf(20000, 26065),
@@ -108,6 +182,54 @@ object Constants {
             listOf(24500, 26250),
             listOf(24500, 26250),
             listOf(24500, 26250),
+        ),
+        "HCV-000-3003" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3004" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3005" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3006" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3007" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3008" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3009" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+        ),
+        "HCV-000-3010" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         )
     )
 }

app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt

@@ -11,7 +11,7 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.google.android.datatransport.runtime.dagger.Provides
 import javax.inject.Singleton
 
-@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 11, exportSchema = false)
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 13, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao

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

@@ -114,6 +114,15 @@ class MainActivity : AppCompatActivity() {
                         Constants.DEVICE_TYPE_HOMOCUBE
                     }
 
+                    device.productId == Constants.HEMO_CUBE_V2_PRODUCT_ID && device.vendorId == Constants.HEMO_CUBE_V2_VENDOR_ID -> {
+                        binding.cvItem1.visibility = View.VISIBLE
+                        binding.cvItem3.visibility = View.VISIBLE
+                        binding.cvItem2.visibility = View.GONE
+                        binding.cvItem4.visibility = View.GONE
+                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
+                        Constants.DEVICE_TYPE_HOMOCUBE
+                    }
+
                     device.productId == Constants.DEVICE_PRODUCT_ID && device.vendorId == Constants.DEVICE_VENDOR_ID -> {
                         Log.d(
                             TAG,

app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt

@@ -26,6 +26,7 @@ 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
 
@@ -196,7 +197,7 @@ class UserListAdapter(
 //                    }
             }
             userCard.setOnClickListener {
-                if (batLevel < 40) {
+                if (batLevel < Constants.BATTERY_LEVEL_MIN) {
                     Toast.makeText(
                         view.context,
                         context?.getString(R.string.low_battery_warning),

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

@@ -57,6 +57,7 @@ class HemoCubeFragment : Fragment() {
     private var validationError = false
     private var deviceHardwareId = ""
     private var allErrorMessages = ""
+    private var testStatusCode = 0.0
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
@@ -121,6 +122,11 @@ class HemoCubeFragment : Fragment() {
 
         }
 
+        if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+            activity?.runOnUiThread {
+                binding.tvDeviceMessages.visibility = View.VISIBLE
+            }
+        }
     }
 
     private fun observeViewModel() {
@@ -130,13 +136,11 @@ class HemoCubeFragment : Fragment() {
 
                 activity?.runOnUiThread {
                     binding.btnSubmit.visibility = View.GONE
-                    binding.btnDigitalCard.visibility = View.VISIBLE
-                    binding.btnDigitalCard.setOnClickListener {
                         val i = Intent(
-                            requireContext().applicationContext, DigitalCardActivity::class.java
+                            requireContext().applicationContext, DashboardActivity::class.java
                         )
                         startActivity(i)
-                    }
+
                 }
             }
             if (result == "Local") {
@@ -173,6 +177,10 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
         }
+
+        hemoCubeViewModel.deviceMessages.observe(viewLifecycleOwner) {
+            binding.tvDeviceMessages.text = it
+        }
     }
 
     private fun checkAndStartProcess() {
@@ -253,7 +261,7 @@ class HemoCubeFragment : Fragment() {
                     data?.let {
                         val stringData = String(it)
                         fullReadOutput.append(stringData)
-                        handleUsbData(stringData, fullReadOutput)
+                        handleUsbData(stringData, testStatusCode)
                     }
                 }
 
@@ -286,23 +294,29 @@ class HemoCubeFragment : Fragment() {
             })
     }
 
-    private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
+    private fun handleUsbData(stringData: String, testStatusCode: Double) {
         if (stringData.contains("#")) {
             isTestOngoing = true
         }
 
         resultData += stringData
+        hemoCubeViewModel.deviceMessages.postValue(resultData)
 
         when {
-            stringData.contains("SN") -> {
+            resultData.contains("SNE") && this.testStatusCode < Constants.TEST_STATUS_CODE_CONFIG_COMPLETED -> {
-                val slData = stringData.split(" ")
+                val pattern = Regex("HPP1-\\d{4}-\\d{4}")
-                if (slData.size > 1) {
+                val matchResult = pattern.find(resultData)
-                    val hardwareId = slData[1].trim()
+                val hardwareId = matchResult?.value
-                    deviceHardwareId = hardwareId
+
+                if (hardwareId.toString().length == 14) {
+                    deviceHardwareId += hardwareId
                     with(sharedPreferences.edit()) {
-                        putString(Constants.DEVICE_ID, hardwareId)
+                        putString(Constants.DEVICE_ID, deviceHardwareId)
                         apply()
                     }
+                    this.testStatusCode = Constants.TEST_STATUS_CODE_CONFIG_COMPLETED
+                } else {
+                    hemoCubeViewModel.messages.postValue("Config error")
                 }
                 activity?.runOnUiThread {
                     binding.btnPlacebuffer.visibility = View.VISIBLE
@@ -310,32 +324,37 @@ class HemoCubeFragment : Fragment() {
                 hemoCubeViewModel.messages.postValue(getString(R.string.start))
             }
 
-            stringData.contains("#BS") -> {
+            resultData.contains("#BS") && this.testStatusCode < Constants.TEST_STATUS_CODE_BUFFER_STARTED -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.buffer_started))
+                this.testStatusCode = Constants.TEST_STATUS_CODE_BUFFER_STARTED
             }
 
-            stringData.contains("#BC") -> {
+            resultData.contains("#BC") && this.testStatusCode < Constants.TEST_STATUS_CODE_BUFFER_COMPLETED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_BUFFER_COMPLETED
                 activity?.runOnUiThread {
                     binding.tvSubtitle4.text = getString(R.string.buffer_completed)
                     binding.btnSamplestart.visibility = View.VISIBLE
                 }
             }
 
-            stringData.contains("#SS") -> {
+            resultData.contains("#SS") && this.testStatusCode < Constants.TEST_STATUS_CODE_SAMPLE_STARTED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_SAMPLE_STARTED
                 activity?.runOnUiThread {
                     binding.tvSubtitle4.text = getString(R.string.sample_started)
                     binding.btnSamplestart.visibility = View.GONE
                 }
             }
 
-            stringData.contains("#SC") -> {
+            resultData.contains("#SC") && this.testStatusCode < Constants.TEST_STATUS_CODE_SAMPLE_COMPLETED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_SAMPLE_COMPLETED
                 hemoCubeViewModel.messages.postValue(
                     getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data))
                 fetchResult()
                 testingTrace.stop()
             }
 
-            resultData.contains("REND") -> {
+            resultData.contains("REND") && this.testStatusCode < Constants.TEST_STATUS_CODE_SAMPLE_PRINT_COMPLETED -> {
+                this.testStatusCode = Constants.TEST_STATUS_CODE_SAMPLE_PRINT_COMPLETED
                 hemoCubeViewModel.messages.postValue(
                     getString(R.string.data_collected_processing_data)
                 )

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

@@ -51,6 +51,7 @@ class HemoCubeViewModel @Inject constructor(
         val deviceData = MutableLiveData<DeviceData?>()
         val networkStatusLiveData: LiveData<Boolean>
             get() = _networkStatusLiveData
+        val deviceMessages = MutableLiveData<String?>()
         val fireBaseUpload = MutableLiveData<String>()
         val fireBaseBulkUpload = MutableLiveData<String>()
 

app/src/main/res/layout/fragment_hemo_cube_reference.xml

@@ -195,16 +195,31 @@
             style="@style/title1_1"
             android:visibility="gone"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="40dp"
             android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="172dp"
+            android:layout_marginTop="72dp"
             android:gravity="center"
             android:textColor="@color/red"
-            android:textSize="18sp"
+            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:visibility="gone"
+            android:layout_width="0dp"
+            android:layout_height="180dp"
+            android:layout_marginHorizontal="24dp"
+            android:layout_marginTop="72dp"
+            android:gravity="center"
+            android:textColor="@color/black"
+            android:textSize="11sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/error_message" />
+
         <Button
             android:visibility="gone"
             android:id="@+id/btn_digitalCard"

app/src/main/res/xml/device_filter.xml

@@ -9,7 +9,7 @@
 <!--    <usb-device vendor-id="1027" product-id="24592" /> &lt;!&ndash; 0x6010: FT2232H &ndash;&gt;-->
 <!--    <usb-device vendor-id="1027" product-id="24593" /> &lt;!&ndash; 0x6011: FT4232H &ndash;&gt;-->
 <!--    <usb-device vendor-id="1027" product-id="24596" /> &lt;!&ndash; 0x6014: FT232H &ndash;&gt;-->
-    <usb-device vendor-id="1027" product-id="24597" /> <!-- 0x6015: FT230X, FT231X, FT234XD -->
+    <usb-device vendor-id="1027" product-id="24577" /> <!-- 0x6015: FT230X, FT231X, FT234XD -->
     <usb-device vendor-id="6790" product-id="29987" /> <!-- 0x6015: FT230X, FT231X, FT234XD -->
 
     <!-- 0x10C4 / 0xEA??: Silabs CP210x -->