Fixed buffer error and updated incubationTime on the user card

This commit is contained in:
mohamedkaif356
2023-09-20 16:09:34 +05:30
parent 5647340b90
commit a7adb02593
6 changed files with 34 additions and 29 deletions

2
.idea/misc.xml generated
View File

@@ -34,7 +34,7 @@
</map> </map>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

View File

@@ -15,11 +15,11 @@ android {
namespace 'in.sminnovations.hpostesting' namespace 'in.sminnovations.hpostesting'
defaultConfig { defaultConfig {
applicationId "in.sminnovations.hpostesting" applicationId "in.sminnovations.hpostesting.prod"
minSdk 21 minSdk 21
targetSdk 34 targetSdk 34
versionCode 10 versionCode 11
versionName "2.1.10" versionName "2.1.13"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

View File

@@ -47,6 +47,10 @@ object Constants {
"HC-V1-004", "HC-V1-004",
"HC-V1-005", "HC-V1-005",
"HC-V1-006", "HC-V1-006",
"HC-V1-007",
"HC-V1-008",
"HC-V1-009",
"HC-V1-010",
) )
const val password = "SMI@12345" const val password = "SMI@12345"

View File

@@ -37,13 +37,14 @@ class UserListAdapter(
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
override fun onBindViewHolder(holder: OrderItemViewHolder, position: Int, model: UserData) { override fun onBindViewHolder(holder: OrderItemViewHolder, position: Int, model: UserData) {
holder.binding.apply { holder.binding.apply {
userName.text = "Name: ${model.name}"
userId.text = "User ID:${model._id}"
if (model.incubationTime == "") { if (model.incubationTime == "") {
btnStartIncubation.visibility = View.VISIBLE btnStartIncubation.visibility = View.VISIBLE
} else { } else {
userId.text = "User ID:${model._id} \n Time: ${isBetween15And30Minutes(model.incubationTime)}"
btnStartIncubation.visibility = View.GONE btnStartIncubation.visibility = View.GONE
} }
userName.text = "Name: ${model.name}"
userId.text = "User ID:${model._id}"
Glide.with(view).load(model.userImageURL).into(userImage) Glide.with(view).load(model.userImageURL).into(userImage)
if (model.testStatus!!) { if (model.testStatus!!) {
teststatus.text = "Test concluded" teststatus.text = "Test concluded"

View File

@@ -11,6 +11,8 @@ import androidx.navigation.ui.navigateUp
import androidx.navigation.ui.setupActionBarWithNavController import androidx.navigation.ui.setupActionBarWithNavController
import androidx.navigation.ui.setupWithNavController import androidx.navigation.ui.setupWithNavController
import com.google.android.material.navigation.NavigationView 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.FirebaseAppDistribution
//import com.google.firebase.appdistribution.FirebaseAppDistributionException //import com.google.firebase.appdistribution.FirebaseAppDistributionException
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
@@ -58,27 +60,26 @@ class DashboardActivity : AppCompatActivity() {
override fun onResume() { override fun onResume() {
super.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()
// val firebaseAppDistribution = FirebaseAppDistribution.getInstance() firebaseAppDistribution.updateIfNewReleaseAvailable()
// firebaseAppDistribution.updateIfNewReleaseAvailable() .addOnProgressListener { updateProgress ->
// .addOnProgressListener { updateProgress -> Toast.makeText(this, "Updating", Toast.LENGTH_SHORT).show()
// Toast.makeText(this, "Updating", Toast.LENGTH_SHORT).show() }
// } .addOnFailureListener { e ->
// .addOnFailureListener { e -> // (Optional) Handle errors.
// // (Optional) Handle errors. if (e is FirebaseAppDistributionException) {
// if (e is FirebaseAppDistributionException) { when (e.errorCode) {
// when (e.errorCode) { FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> {
// FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> { // SDK did nothing. This is expected when building for Play.
// // SDK did nothing. This is expected when building for Play. }
// }
// else -> {
// else -> { // Handle other errors.
// // Handle other errors. }
// } }
// } }
// } }
// }
} }

View File

@@ -29,7 +29,6 @@ import com.google.firebase.ktx.Firebase
import `in`.sminnovations.hpostesting.R import `in`.sminnovations.hpostesting.R
import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.tasks.await import kotlinx.coroutines.tasks.await
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@@ -439,7 +438,7 @@ class HemoCubeFragment : Fragment() {
this.classificationResult = findResult(calculatedRatio) this.classificationResult = findResult(calculatedRatio)
hemoCubeViewModel.messages.postValue(this.classificationResult) hemoCubeViewModel.messages.postValue(this.classificationResult)
this.resultData = fullReadOutput this.resultData = fullReadOutput
if (!isBufferValueAvailable()) { if (!isUsingExistingBuffer) {
with(sharedPreferences.edit()) { with(sharedPreferences.edit()) {
putString(Constants.BUFFER_VALUE_1, led1Buffer.toString()) putString(Constants.BUFFER_VALUE_1, led1Buffer.toString())
putString(Constants.BUFFER_VALUE_2, led2Buffer.toString()) putString(Constants.BUFFER_VALUE_2, led2Buffer.toString())