From b6e086c4072816d89d0c29892e7252c4984f19b8 Mon Sep 17 00:00:00 2001 From: "smileomi18@gmail.com" Date: Tue, 5 Sep 2023 15:37:53 +0530 Subject: [PATCH] APP VERSION added --- app/build.gradle | 2 +- .../example/hpostesting/data/model/patient/HemoCubeTestData.kt | 1 + .../hpostesting/presentation/hemocube/HemoCubeFragment.kt | 3 +++ .../hpostesting/presentation/hemocube/HemoCubeViewModel.kt | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dafd795..d2d7257 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { namespace 'in.sminnovations.hpostesting' defaultConfig { - applicationId "in.sminnovations.hpostesting.prod" + applicationId "in.sminnovations.hpostesting" minSdk 21 targetSdk 34 versionCode 2 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..97e2953 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 @@ -17,6 +17,7 @@ data class HemoCubeTestData( var testStatus: Boolean? = false, var localFlag: Boolean = false, var deviceId: String? = "", + var appVersion:String? = "", var deviceSerialNumber: String = "", var deviceType: String = "HEMOCUBE", var kitSerial: 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 4edae9e..b2b7ec4 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,6 +336,7 @@ class HemoCubeFragment : Fragment() { } else { result[4].toDoubleOrNull() } + val version = BuildConfig.VERSION_NAME val led1Sample = result[5].toDoubleOrNull() val led2Sample = result[6].toDoubleOrNull() val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0) @@ -353,6 +355,7 @@ class HemoCubeFragment : Fragment() { deviceId = deviceSerialNo led1Buffer = led1BufferForDevice led2Buffer = led2BufferForDevice + appVersion = version this.led1Sample = led1Sample this.led2Sample = led2Sample this.led1Average = led1Average 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 2c0c470..da10ad6 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 @@ -77,7 +77,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()