From a7adb0259394ff8879bfdab3de6261909dea3b51 Mon Sep 17 00:00:00 2001 From: mohamedkaif356 Date: Wed, 20 Sep 2023 16:09:34 +0530 Subject: [PATCH] Fixed buffer error and updated incubationTime on the user card --- .idea/misc.xml | 2 +- app/build.gradle | 6 +-- .../hpostesting/data/constant/Constants.kt | 4 ++ .../presentation/adapter/UserListAdapter.kt | 5 ++- .../dashboard/DashboardActivity.kt | 43 ++++++++++--------- .../presentation/hemocube/HemoCubeFragment.kt | 3 +- 6 files changed, 34 insertions(+), 29 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index e533f05..4b28633 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -34,7 +34,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 295b626..1158de0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,11 +15,11 @@ android { namespace 'in.sminnovations.hpostesting' defaultConfig { - applicationId "in.sminnovations.hpostesting" + applicationId "in.sminnovations.hpostesting.prod" minSdk 21 targetSdk 34 - versionCode 10 - versionName "2.1.10" + versionCode 11 + versionName "2.1.13" 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 0556665..bf9a4bc 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 @@ -47,6 +47,10 @@ object Constants { "HC-V1-004", "HC-V1-005", "HC-V1-006", + "HC-V1-007", + "HC-V1-008", + "HC-V1-009", + "HC-V1-010", ) const val password = "SMI@12345" diff --git a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt index 04ff336..77e285c 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt @@ -37,13 +37,14 @@ class UserListAdapter( @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: OrderItemViewHolder, position: Int, model: UserData) { holder.binding.apply { + userName.text = "Name: ${model.name}" + userId.text = "User ID:${model._id}" if (model.incubationTime == "") { btnStartIncubation.visibility = View.VISIBLE } else { + userId.text = "User ID:${model._id} \n Time: ${isBetween15And30Minutes(model.incubationTime)}" btnStartIncubation.visibility = View.GONE } - userName.text = "Name: ${model.name}" - userId.text = "User ID:${model._id}" Glide.with(view).load(model.userImageURL).into(userImage) if (model.testStatus!!) { teststatus.text = "Test concluded" diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt index d557dec..8b49ff3 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt @@ -11,6 +11,8 @@ import androidx.navigation.ui.navigateUp import androidx.navigation.ui.setupActionBarWithNavController import androidx.navigation.ui.setupWithNavController import com.google.android.material.navigation.NavigationView +import com.google.firebase.appdistribution.FirebaseAppDistribution +import com.google.firebase.appdistribution.FirebaseAppDistributionException //import com.google.firebase.appdistribution.FirebaseAppDistribution //import com.google.firebase.appdistribution.FirebaseAppDistributionException import dagger.hilt.android.AndroidEntryPoint @@ -58,27 +60,26 @@ class DashboardActivity : AppCompatActivity() { override fun onResume() { super.onResume() - // Copy and paste this into any part of your app - for example, in your main -// activity's onResume method. -// val firebaseAppDistribution = FirebaseAppDistribution.getInstance() -// firebaseAppDistribution.updateIfNewReleaseAvailable() -// .addOnProgressListener { updateProgress -> -// Toast.makeText(this, "Updating", Toast.LENGTH_SHORT).show() -// } -// .addOnFailureListener { e -> -// // (Optional) Handle errors. -// if (e is FirebaseAppDistributionException) { -// when (e.errorCode) { -// FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> { -// // SDK did nothing. This is expected when building for Play. -// } -// -// else -> { -// // Handle other errors. -// } -// } -// } -// } + + val firebaseAppDistribution = FirebaseAppDistribution.getInstance() + firebaseAppDistribution.updateIfNewReleaseAvailable() + .addOnProgressListener { updateProgress -> + Toast.makeText(this, "Updating", Toast.LENGTH_SHORT).show() + } + .addOnFailureListener { e -> + // (Optional) Handle errors. + if (e is FirebaseAppDistributionException) { + when (e.errorCode) { + FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> { + // SDK did nothing. This is expected when building for Play. + } + + else -> { + // Handle other errors. + } + } + } + } } 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 29ba960..29c25ae 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 @@ -29,7 +29,6 @@ import com.google.firebase.ktx.Firebase import `in`.sminnovations.hpostesting.R import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.tasks.await import kotlinx.coroutines.withContext @@ -439,7 +438,7 @@ class HemoCubeFragment : Fragment() { this.classificationResult = findResult(calculatedRatio) hemoCubeViewModel.messages.postValue(this.classificationResult) this.resultData = fullReadOutput - if (!isBufferValueAvailable()) { + if (!isUsingExistingBuffer) { with(sharedPreferences.edit()) { putString(Constants.BUFFER_VALUE_1, led1Buffer.toString()) putString(Constants.BUFFER_VALUE_2, led2Buffer.toString())