From cdb7853c59b40e2c9fed4d31298468bd1f592049 Mon Sep 17 00:00:00 2001 From: "smileomi18@gmail.com" Date: Tue, 5 Sep 2023 13:51:25 +0530 Subject: [PATCH] APP VERSION added --- .../hpostesting/data/model/patient/HemoCubeTestData.kt | 3 ++- .../hpostesting/presentation/hemocube/HemoCubeFragment.kt | 4 +++- .../hpostesting/presentation/hemocube/HemoCubeViewModel.kt | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt index b894656..179e878 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt @@ -28,5 +28,6 @@ data class HemoCubeTestData( var led1Average: Double? = null, var led2Average: Double? = null, var deviceRatio: Double? = null, - var calculatedRatio: Double? = null + var calculatedRatio: Double? = null, + var appVersion: String? = "" ) 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 f64a990..f127c0e 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 @@ -23,6 +23,7 @@ import com.example.hpostesting.presentation.utils.MyDialogListener import com.example.hpostesting.presentation.utils.UIUtils import com.google.firebase.firestore.FirebaseFirestore import com.google.firebase.firestore.ktx.firestore +import com.google.firebase.ktx.BuildConfig import com.google.firebase.ktx.Firebase import `in`.sminnovations.hpostesting.R import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding @@ -335,9 +336,10 @@ class HemoCubeFragment : Fragment() { val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0) val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0) val deviceRatio = led1Average / led2Average - + val version = BuildConfig.VERSION_NAME DataHolder.hemoCubeTestData?.apply { deviceId = deviceSerialNo + appVersion = version led1Buffer = led1BufferForDevice led2Buffer = led2BufferForDevice this.led1Sample = led1Sample 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 702ff66..164afe9 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 @@ -75,7 +75,7 @@ class HemoCubeViewModel @Inject constructor( testDetails?.testTime = SimpleDateFormat( "yyyy-MM-dd HH:mm:ss", Locale.getDefault() ).format(Calendar.getInstance().time) - + testDetails?.appVersion = DataHolder.hemoCubeTestData?.appVersion testDetails?.deviceId = DataHolder.hemoCubeTestData?.deviceId testDetails?.deviceSerialNumber = sharedPreference.getString(Constants.USER_ID, "").toString() testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()