diff --git a/app/build.gradle b/app/build.gradle index ffde505..924f244 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 20 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 c52b5be..11aa88a 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 @@ -4,6 +4,7 @@ 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 @@ -39,6 +40,7 @@ class HemoCubeFragment : Fragment() { private lateinit var binding: FragmentHemoCubeReferenceBinding private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels() private lateinit var sharedPreferences: SharedPreferences + val testDetails = DataHolder.selectedTest?.toHemoCubeTestData() private var isOnline = false private var currentDeviceData: DeviceData? = null private var resultData: String = "" @@ -84,6 +86,10 @@ class HemoCubeFragment : Fragment() { binding.btnSubmit.isEnabled = false binding.btnSubmit.isClickable = false + + binding.tvName.text = "Name: ${testDetails?.name}\n ID: ${testDetails?._id}" + Log.e("namete",binding.tvName.text.toString()) + binding.btnKit.setOnClickListener { if (isTestOngoing) { val title = "WARNING" @@ -432,10 +438,7 @@ class HemoCubeFragment : Fragment() { // } DataHolder.hemoCubeTestData?.apply { - activity?.runOnUiThread { - binding.tvName.visibility = View.VISIBLE - } - binding.tvName.text = "Name: ${this.name}\n ID: ${this._id}" + deviceId = deviceSerialNo led1Buffer = led1BufferForDevice led2Buffer = led2BufferForDevice diff --git a/app/src/main/res/layout/fragment_hemo_cube_reference.xml b/app/src/main/res/layout/fragment_hemo_cube_reference.xml index 170ee39..dcf4f6c 100644 --- a/app/src/main/res/layout/fragment_hemo_cube_reference.xml +++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml @@ -50,7 +50,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/btn_submit" />