Merge branch 'dev-check-apk-update' of https://gitlab.com/sminnovations/hpos into dev-check-apk-update

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "in.sminnovations.hpostesting.dev"
         minSdk 21
         targetSdk 34
-        versionCode 120
+        versionCode 114
-        versionName "2.1.120"
+        versionName "2.1.114"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -193,7 +193,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
     override fun onDestroy() {
         if(isRegistered) {
             try {
-//                unregisterReceiver(downloadReceiver)
+                unregisterReceiver(downloadReceiver)
             } catch (e: Exception) {
                 Log.d("HomeFragment", e.toString())
             }

app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt

@@ -22,7 +22,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.annotation.RequiresApi
-import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
@@ -151,7 +150,7 @@ class HomeFragment : Fragment() {
                 }
 
                 // Now re-subscribe to allUserData
-                hemoCubeViewModel.allLocalData.observe(viewLifecycleOwner) { originalUserDataList ->
+                hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { originalUserDataList ->
 
                     Log.d("LOCAL_DB OBSERVE", "OBSERVE CALLED")
 
@@ -237,48 +236,33 @@ class HomeFragment : Fragment() {
             logoutUser(requireContext())
         }
 
-        binding.btnLogout1.setOnClickListener {
-            logoutUser(requireContext())
-        }
-
         binding.uploadData.setOnClickListener {
 //            showUploadDialog(requireContext())
         }
-//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
+        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
-//
-//            val btnSaveLocalVisibility =
-//                if (userData.any { it.testStatus == true }) View.GONE else View.GONE
-//
-//            binding.downloadCSV.visibility = btnSaveLocalVisibility
-//
-//            binding.downloadCSV.setOnClickListener {
-//                if (btnSaveLocalVisibility == View.VISIBLE) {
-//                    // Execute the action when the button is visible (testStatus is true for at least one user)
-//                    showDownloadDialog(requireContext())
-//                } else {
-//                    // Handle the case when the button is not visible
-//                    Toast.makeText(
-//                        requireContext(),
-//                        "No test details stored locally",
-//                        Toast.LENGTH_SHORT
-//                    ).show()
-//                }
-//            }
-//        }
 
+            val btnSaveLocalVisibility =
+                if (userData.any { it.testStatus == true }) View.GONE else View.GONE
 
-        binding.btnNewKit.setOnClickListener {
+            binding.downloadCSV.visibility = btnSaveLocalVisibility
-            with(sharedPreference.edit()) {
+
-                putString(Constants.KIT_NUMBER, "")
+            binding.downloadCSV.setOnClickListener {
-                putInt(Constants.KIT_COUNT, 0)
+                if (btnSaveLocalVisibility == View.VISIBLE) {
-                apply()
+                    // Execute the action when the button is visible (testStatus is true for at least one user)
+                    showDownloadDialog(requireContext())
+                } else {
+                    // Handle the case when the button is not visible
+                    Toast.makeText(
+                        requireContext(),
+                        "No test details stored locally",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
             }
-            startActivity(Intent(requireContext(), KitScanActivity::class.java))
-            requireActivity().finish()
         }
 
 
-        binding.btnNewKitoffline.setOnClickListener {
+        binding.btnNewKit.setOnClickListener {
             with(sharedPreference.edit()) {
                 putString(Constants.KIT_NUMBER, "")
                 putInt(Constants.KIT_COUNT, 0)
@@ -326,7 +310,7 @@ class HomeFragment : Fragment() {
                        hemoCubeViewModel.login(createLoginRequestData(userID, password))
                    }
              }
-        } else if (userID == "deviceIDAPI" && password == "devicePasswordAPI" && deviceId.isNotEmpty()) {
+        } else if (userID.isEmpty() && password.isEmpty() && deviceId.isNotEmpty()) {
             fetchDeviceCredentials()
         } else {
             Toast.makeText(
@@ -862,16 +846,16 @@ class HomeFragment : Fragment() {
     }
 
     private fun checkForLocalDBData() {
-//        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-//            val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
+            val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
-//            binding.uploadData.visibility = uploadDataVisibility
+            binding.uploadData.visibility = uploadDataVisibility
-//        }
+        }
-//
+
-//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-//            val uploadDataVisibility =
+            val uploadDataVisibility =
-//                if (userDataList.any { !it.localFlag && !it.molbioFlag && it.testStatus == true }) View.VISIBLE else View.GONE
+                if (userDataList.any { !it.localFlag && !it.molbioFlag && it.testStatus == true }) View.VISIBLE else View.GONE
-//            binding.uploadData.visibility = uploadDataVisibility
+            binding.uploadData.visibility = uploadDataVisibility
-//        }
+        }
 
         hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { bufferData ->
             val uploadDataVisibility =
@@ -881,11 +865,11 @@ class HomeFragment : Fragment() {
     }
 
     private fun checkUnprocessedCSVData() {
-//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-//            val downloadDataVisibility =
+            val downloadDataVisibility =
-//                if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.GONE else View.GONE
+                if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.GONE else View.GONE
-//            binding.downloadCSV.visibility = downloadDataVisibility
+            binding.downloadCSV.visibility = downloadDataVisibility
-//        }
+        }
     }
 
     private fun sanitizeDoubleValues(hemoCubeTestData: HemoCubeTestData): HemoCubeTestData {
@@ -938,23 +922,23 @@ class HomeFragment : Fragment() {
 //    }
 
     private fun uploadLocalDBData(dialog: DialogInterface) {
-//        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-//            if (userDataList.isEmpty()) {
+            if (userDataList.isEmpty()) {
-//                dialog.dismiss()
+                dialog.dismiss()
-//            } else {
+            } else {
-//                userDataList.forEach { userData ->
+                userDataList.forEach { userData ->
-//                    viewModel.bulkUploadResultToDatabase(userData)
+                    viewModel.bulkUploadResultToDatabase(userData)
-//                    viewModel.deleteById(userData._id)
+                    viewModel.deleteById(userData._id)
-//                }
+                }
-//                dialog.dismiss()
+                dialog.dismiss()
-//                Toast.makeText(
+                Toast.makeText(
-//                    requireContext(), R.string.upload_success_message, Toast.LENGTH_SHORT
+                    requireContext(), R.string.upload_success_message, Toast.LENGTH_SHORT
-//                ).show()
+                ).show()
-//            }
+            }
-//        }
+        }
 
-//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-//            val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
+            val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
 //            userDataList.forEach { userData ->
 //                if (!userData.molbioFlag && isTokenAvailable) {
 //                    resultList.results?.add(
@@ -983,8 +967,8 @@ class HomeFragment : Fragment() {
 //                    hemoCubeViewModel.uploadResult(resultList)
 //                }
 //            }
-//            dialog.dismiss()
+            dialog.dismiss()
-//        }
+        }
 
         hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { kitDataList ->
             kitDataList.forEach { userData ->
@@ -1059,7 +1043,7 @@ class HomeFragment : Fragment() {
         builder.setMessage(R.string.download_db_registration_message)
 
         builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
-//            downloadLocalDBData(dialog)
+            downloadLocalDBData(dialog)
         }
 
         builder.setNegativeButton(R.string.cancel) { dialog, _ ->
@@ -1070,49 +1054,49 @@ class HomeFragment : Fragment() {
         dialog.show()
     }
 
-//    private fun downloadLocalDBData(dialog: DialogInterface) {
+    private fun downloadLocalDBData(dialog: DialogInterface) {
-//        var csvDownloaded = false
+        var csvDownloaded = false
-//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-//            try {
+            try {
-//                if (!csvDownloaded) {
+                if (!csvDownloaded) {
-//                    val downloadList = mutableListOf<HemoCubeTestData>()
+                    val downloadList = mutableListOf<HemoCubeTestData>()
-//
+
-//                    userDataList.forEach { userData ->
+                    userDataList.forEach { userData ->
-//                        if (userData.testStatus == true) {
+                        if (userData.testStatus == true) {
-////                        if (!userData.isCSVCreated) {
+//                        if (!userData.isCSVCreated) {
-//                            downloadList.add(userData) // Add the userData to downloadList
+                            downloadList.add(userData) // Add the userData to downloadList
+                        }
 //                        }
-////                        }
+                    }
-//                    }
+
-//
+                    if (downloadList.isNotEmpty()) {
-//                    if (downloadList.isNotEmpty()) {
+                        // Call ViewModel function to create CSV with filtered data
-//                        // Call ViewModel function to create CSV with filtered data
+                        hemoCubeViewModel.createCSV(downloadList, requireContext())
-//                        hemoCubeViewModel.createCSV(downloadList, requireContext())
+                        csvDownloaded = true
-//                        csvDownloaded = true
+                        Toast.makeText(
-//                        Toast.makeText(
+                            requireContext(),
-//                            requireContext(),
+                            "CSV file downloaded successfully",
-//                            "CSV file downloaded successfully",
+                            Toast.LENGTH_SHORT
-//                            Toast.LENGTH_SHORT
+                        ).show()
-//                        ).show()
+                    } else {
-//                    } else {
+                        Toast.makeText(
-//                        Toast.makeText(
+                            requireContext(),
-//                            requireContext(),
+                            "No data to download",
-//                            "No data to download",
+                            Toast.LENGTH_SHORT
-//                            Toast.LENGTH_SHORT
+                        )
-//                        )
+                            .show()
-//                            .show()
+                    }
-//                    }
+                }
-//                }
+
-//
+            } catch (e: Exception) {
-//            } catch (e: Exception) {
+                e.printStackTrace()
-//                e.printStackTrace()
+                Toast.makeText(requireContext(), "Error downloading CSV file", Toast.LENGTH_SHORT)
-//                Toast.makeText(requireContext(), "Error downloading CSV file", Toast.LENGTH_SHORT)
+                    .show()
-//                    .show()
+            } finally {
-//            } finally {
+                dialog.dismiss()
-//                dialog.dismiss()
+            }
-//            }
+        }
-//        }
+    }
-//    }
 
     private fun getDeviceId() {
         Log.d("HomeFragmentUSb","getDeviceId")
@@ -1174,7 +1158,7 @@ class HomeFragment : Fragment() {
                             val deviceUpdateAvailableGlobal= deviceData.deviceUpdateAvailable
                             val updatePathGlobal= deviceData.updatePath
 
-
+                           // if(deviceUpdateAvailableGlobal){
                                  db.collection("devices").whereEqualTo("deviceId", deviceId).get().addOnSuccessListener { documentSnapshotNew ->
                                     if (documentSnapshotNew.documents.isNotEmpty()) {
                                         documentSnapshotNew.documents.forEach{
@@ -1198,24 +1182,14 @@ class HomeFragment : Fragment() {
                                                     Log.d("HomeFragmentUpdate","Device update not available")
                                                 }
                                             }else{
-                                                if(deviceUpdateAvailableGlobal) {
+                                                if(!globalUpdateDone){
-                                                    if (!globalUpdateDone) {
+                                                    val update = db.collection("devices").document(it.id).update("globalUpdateDone",true)
-                                                        val update =
+                                                    update.addOnSuccessListener {
-                                                            db.collection("devices").document(it.id)
+                                                        Log.d("HomeFragmentUpdate","Device global update done")
-                                                                .update("globalUpdateDone", true)
-                                                        update.addOnSuccessListener {
-                                                            Log.d(
-                                                                "HomeFragmentUpdate",
-                                                                "Device global update done"
-                                                            )
 
-                                                            initiateUpdate(updatePathGlobal)
+                                                        initiateUpdate(updatePathGlobal)
-                                                        }.addOnFailureListener {
+                                                    }.addOnFailureListener{
-                                                            Log.e(
+                                                        Log.e("fetchDeviceUpdate", "update fail.")
-                                                                "fetchDeviceUpdate",
-                                                                "update fail."
-                                                            )
-                                                        }
                                                     }
                                                 }
                                             }
@@ -1237,7 +1211,8 @@ class HomeFragment : Fragment() {
                                 "fetchDeviceCredentials",
                                 "deviceVersion: $deviceVersion, Password: $deviceUpdateAvailableGlobal, updatePath: $updatePathGlobal"
                             )
-                    // ?: Log.e("fetchDeviceUpdate", "Failed to parse device data.")
+
+                       // } ?: Log.e("fetchDeviceUpdate", "Failed to parse device data.")
                     } else {
                         Log.e("fetchDeviceUpdate", "Document does not exist.")
                     }

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

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -173,11 +172,10 @@ class HemoCubeFragment : Fragment() {
                                 it.exception.let { message ->
                                     Toast.makeText(
                                         activity,
-                                        "$message",
+                                        "An error occurred: $message",
                                         Toast.LENGTH_LONG
                                     )
                                         .show()
-                                    Log.d("resultuploadfail1", message.toString())
                                 }
                                 handleReadingFinish()
                             }

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

@@ -37,7 +37,6 @@ import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.CheckUpdateWorker
 import com.example.hpostesting.domain.LogFileManager
-import com.google.gson.GsonBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -89,7 +88,6 @@ class HemoCubeViewModel @Inject constructor(
 
     private val _networkStatusLiveData = NetworkStatusLiveData(context)
     val allUserData = hemoCubeDao.getAll()
-    val allLocalData = hemoCubeDao.getAll()
     val allPendingUserToUpload = MutableLiveData<List<HemoCubeTestData>>()
     val allKitTestData = hemoCubeBufferDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
@@ -335,24 +333,20 @@ class HemoCubeViewModel @Inject constructor(
                         fireBaseUpload.postValue("Success")
                         testDetails.localFlag = true
                         if (Constants.MOLBIO_INTEGRATION) {
-                            // Sanitize testDetails before using it in the API call
-                            val sanitizedTestDetails = sanitizeDoubleValues(testDetails)
-
-                            // Now, use sanitizedTestDetails for the API call
                             uploadResult(
                                 MolbioV2ResultRequest(
                                     mutableListOf(
                                         MolbioV2Result(
-                                            rawData = sanitizedTestDetails,
+                                            rawData = testDetails,
-                                            analysisId = sanitizedTestDetails._id,
+                                            analysisId = testDetails._id,
-                                            analysisDate = sanitizedTestDetails.testTime,
+                                            analysisDate = testDetails.testTime,
-                                            analysisStatus = sanitizedTestDetails.classificationResult,
+                                            analysisStatus = testDetails.classificationResult,
-                                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[sanitizedTestDetails.deviceId]?.toString(),
+                                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[testDetails.deviceId].toString(),
-                                            interpretation = sanitizedTestDetails.classificationResult,
+                                            interpretation = testDetails.classificationResult,
-                                            testId = sanitizedTestDetails._id,
+                                            testId = testDetails._id,
-                                            testTime = sanitizedTestDetails.testTime,
+                                            testTime = testDetails.testTime,
-                                            collectionTime = sanitizedTestDetails.testTime,
+                                            collectionTime = testDetails.testTime,
-                                            expiryTime = sanitizedTestDetails.testTime,
+                                            expiryTime = testDetails.testTime,
                                         )
                                     )
                                 )
@@ -381,7 +375,7 @@ class HemoCubeViewModel @Inject constructor(
             userData.reportUploadTime = SimpleDateFormat(
                 "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
             ).format(Calendar.getInstance().time)
-            when (repository.addTestToDatabase(userData)) {
+            when (repository.addTestToDatabasefornew(userData)) {
                 is Response.Success -> {
                     fireBaseBulkUpload.postValue("Success")
                     updateLocalFlag(userData._id)
@@ -394,19 +388,6 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
-    fun sanitizeDoubleValues(hemoCubeTestData: HemoCubeTestData): HemoCubeTestData {
-        hemoCubeTestData::class.java.declaredFields.forEach { field ->
-            if (field.type == Double::class.javaObjectType || field.type == Double::class.javaPrimitiveType) {
-                field.isAccessible = true
-                val value = field.get(hemoCubeTestData) as Double?
-                if (value != null && (value.isInfinite() || value.isNaN())) {
-                    field.set(hemoCubeTestData, 0.0) // Replace with a suitable default value
-                }
-            }
-        }
-        return hemoCubeTestData
-    }
-
     private fun updateLocalFlag(userId: String) = viewModelScope.launch {
         hemoCubeDao.updateFieldById(id = userId, true)
     }

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

@@ -38,20 +38,10 @@
         android:visibility="gone"
         android:padding="24dp">
 
-        <ImageView
-            android:id="@+id/btnLogout1"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginEnd="10dp"
-            android:src="@drawable/baseline_logout_24"
-            app:layout_constraintTop_toTopOf="@+id/internetNotAvailableCL"
-            app:layout_constraintEnd_toEndOf="parent"
-            />
-
         <TextView
             android:id="@+id/tv_title_no_internet"
             style="@style/title1"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:layout_marginTop="24dp"
@@ -135,27 +125,6 @@
 <!--            app:layout_constraintBottom_toBottomOf="@+id/rv_order_offline"-->
 <!--            app:layout_constraintStart_toStartOf="parent" />-->
 
-        <TextView
-            android:id="@+id/label1"
-            style="@style/title1_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/new_kit"
-            app:layout_constraintBottom_toTopOf="@+id/btnNewKitoffline"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/btnNewKitoffline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:backgroundTint="@color/primary"
-            android:contentDescription="@string/new_kit"
-            android:src="@drawable/ic_add"
-            app:elevation="1dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/xml/file_paths.xml

@@ -1,3 +1,3 @@
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <external-files-path name="Updates" path="." />
+    <external-files-path name="downloaded_file" path="." />
 </paths>

build.gradle

@@ -3,9 +3,9 @@ buildscript {
         kotlin_version = '1.8.21'
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.android.tools.build:gradle:8.3.0'
-        classpath 'com.google.gms:google-services:4.4.1'
+        classpath 'com.google.gms:google-services:4.4.0'
-        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.1.0'
+        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.1'
     }
     repositories {
         mavenCentral()

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Mon Mar 04 17:08:24 IST 2024
+#Tue Feb 27 16:09:58 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip