From a984e6bf294f8b2e469d2b728c20cc5f80585d5e Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Fri, 16 Feb 2024 08:28:29 +0530 Subject: [PATCH] add device ids --- .../hpostesting/data/constant/Constants.kt | 51 +++++++ .../presentation/dashboard/HomeFragment.kt | 10 +- .../DeviceProvisionFragment.kt | 17 ++- .../hemocube/HemoCubeViewModel.kt | 32 +++-- app/src/main/res/layout/activity_blank.xml | 40 ++++++ app/src/main/res/layout/fragment_blank.xml | 128 ++++++++++++++++++ 6 files changed, 252 insertions(+), 26 deletions(-) create mode 100644 app/src/main/res/layout/activity_blank.xml create mode 100644 app/src/main/res/layout/fragment_blank.xml 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 6b4141c..786c654 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 @@ -170,6 +170,57 @@ object Constants { "HPP1-0124-0048", "HPP1-0124-0049", "HPP1-0124-0050", + "HCV-001-0001", + "HCV-001-0002", + "HCV-001-0003", + "HCV-001-0004", + "HCV-001-0005", + "HCV-001-0006", + "HCV-001-0007", + "HCV-001-0008", + "HCV-001-0009", + "HCV-001-0010", + "HCV-001-0011", + "HCV-001-0012", + "HCV-001-0013", + "HCV-001-0014", + "HCV-001-0015", + "HCV-001-0016", + "HCV-001-0017", + "HCV-001-0018", + "HCV-001-0019", + "HCV-001-0020", + "HCV-001-0021", + "HCV-001-0022", + "HCV-001-0023", + "HCV-001-0024", + "HCV-001-0025", + "HCV-001-0026", + "HCV-001-0027", + "HCV-001-0028", + "HCV-001-0029", + "HCV-001-0030", + "HCV-001-0031", + "HCV-001-0032", + "HCV-001-0033", + "HCV-001-0034", + "HCV-001-0003", + "HCV-001-0035", + "HCV-001-0036", + "HCV-001-0037", + "HCV-001-0038", + "HCV-001-0039", + "HCV-001-0040", + "HCV-001-0041", + "HCV-001-0042", + "HCV-001-0043", + "HCV-001-0044", + "HCV-001-0045", + "HCV-001-0046", + "HCV-001-0047", + "HCV-001-0048", + "HCV-001-0049", + "HCV-001-0050", ) const val password = "SMI@12345" diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt index 92f7aef..9ba2a9b 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt @@ -139,12 +139,14 @@ class HomeFragment : Fragment() { loadUserData() setSearch() checkForLocalDBData() - checkForTokenAndUpdate() + if (Constants.MOLBIO_INTEGRATION) { + checkForTokenAndUpdate() + } hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList -> val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result())) userDataList.forEach { userData -> - if (!userData.molbioFlag && isTokenAvailable) { + if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) { resultList.results?.add( MolbioV2Result( rawData = userData, @@ -160,7 +162,7 @@ class HomeFragment : Fragment() { ) ) } - if (!userData.molbioFlag && isTokenAvailable) { + if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) { userData.molbioFlag = true hemoCubeViewModel.uploadResult(resultList) } @@ -846,7 +848,7 @@ class HomeFragment : Fragment() { userData.localFlag = true hemoCubeViewModel.bulkAddResultTestToDb(userData) } - if (!userData.molbioFlag && isTokenAvailable) { + if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) { userData.molbioFlag = true hemoCubeViewModel.uploadResult(resultList) } diff --git a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt index d5f9c26..7bb268c 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt @@ -50,14 +50,17 @@ class DeviceProvisionFragment : Fragment() { listenToHemoCube() getDeviceId() binding.btnSubmit.setOnClickListener { - viewModel.deviceProvision( - DeviceProvisionRequest( - email = Constants.deviceProvisionEmail, - password = Constants.deviceProvisionPassword, - serialNumber = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(), - uid = sharedPreferences.getString(Constants.DEVICE_ID, "").toString() + if (Constants.MOLBIO_INTEGRATION) { + viewModel.deviceProvision( + DeviceProvisionRequest( + email = Constants.deviceProvisionEmail, + password = Constants.deviceProvisionPassword, + serialNumber = sharedPreferences.getString(Constants.DEVICE_ID, "") + .toString(), + uid = sharedPreferences.getString(Constants.DEVICE_ID, "").toString() + ) ) - ) + } } } diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt index e733d97..819d9d7 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt @@ -319,24 +319,26 @@ class HemoCubeViewModel @Inject constructor( Log.i("Testdb", "Data uploaded to Firestore successfully") fireBaseUpload.postValue("Success") testDetails.localFlag = true - uploadResult( - MolbioV2ResultRequest( - mutableListOf( - MolbioV2Result( - rawData = testDetails, - analysisId = testDetails._id, - analysisDate = testDetails.testTime, - analysisStatus = testDetails.classificationResult, - thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[testDetails.deviceId].toString(), - interpretation = testDetails.classificationResult, - testId = testDetails._id, - testTime = testDetails.testTime, - collectionTime = testDetails.testTime, - expiryTime = testDetails.testTime, + if (Constants.MOLBIO_INTEGRATION) { + uploadResult( + MolbioV2ResultRequest( + mutableListOf( + MolbioV2Result( + rawData = testDetails, + analysisId = testDetails._id, + analysisDate = testDetails.testTime, + analysisStatus = testDetails.classificationResult, + thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[testDetails.deviceId].toString(), + interpretation = testDetails.classificationResult, + testId = testDetails._id, + testTime = testDetails.testTime, + collectionTime = testDetails.testTime, + expiryTime = testDetails.testTime, + ) ) ) ) - ) + } hemoCubeDao.insertAll(testDetails) } diff --git a/app/src/main/res/layout/activity_blank.xml b/app/src/main/res/layout/activity_blank.xml new file mode 100644 index 0000000..5c7e4da --- /dev/null +++ b/app/src/main/res/layout/activity_blank.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_blank.xml b/app/src/main/res/layout/fragment_blank.xml new file mode 100644 index 0000000..26eee95 --- /dev/null +++ b/app/src/main/res/layout/fragment_blank.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + +