From dd2e115995afc782a9050d38360875163d7e97e6 Mon Sep 17 00:00:00 2001 From: Mariya Date: Sat, 30 Mar 2024 16:11:10 +0530 Subject: [PATCH] changes added for without firebase result submit --- .../presentation/hemocube/HemoCubeFragment.kt | 50 ++++++++++++------- .../hemocube/HemoCubeViewModel.kt | 2 +- 2 files changed, 33 insertions(+), 19 deletions(-) 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 b23861c..e0c96e7 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 @@ -208,6 +208,13 @@ class HemoCubeFragment : Fragment() { handleReadingFinish() hemoCubeViewModel.uploadLogs() hemoCubeViewModel.downloadClientCertificate() + activity?.runOnUiThread { + binding.btnSubmit.visibility = View.GONE + val i = Intent( + requireContext().applicationContext, DashboardActivity::class.java + ) + startActivity(i) + } } is Result.Error -> { @@ -223,6 +230,13 @@ class HemoCubeFragment : Fragment() { Log.d("resultuploadfail1", message.toString()) } handleReadingFinish() + activity?.runOnUiThread { + binding.btnSubmit.visibility = View.GONE + val i = Intent( + requireContext().applicationContext, DashboardActivity::class.java + ) + startActivity(i) + } } else -> {} @@ -231,24 +245,24 @@ class HemoCubeFragment : Fragment() { } else { handleReadingFinish() } - hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result -> - if (result == "Success") { - uploadedToCloud = true - var accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString() - showToast(R.string.test_upload) - - } - if (result == "Local") { - showToast(R.string.internt_not_local) - startActivity(Intent(requireActivity(), DashboardActivity::class.java)) - } - if (result == "Error") { - showToast(R.string.error_local) - startActivity(Intent(requireActivity(), DashboardActivity::class.java)) - } - - binding.progressBar.visibility = View.GONE - } +// hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result -> +// if (result == "Success") { +// uploadedToCloud = true +// var accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString() +// showToast(R.string.test_upload) +// +// } +// if (result == "Local") { +// showToast(R.string.internt_not_local) +// startActivity(Intent(requireActivity(), DashboardActivity::class.java)) +// } +// if (result == "Error") { +// showToast(R.string.error_local) +// startActivity(Intent(requireActivity(), DashboardActivity::class.java)) +// } +// +// binding.progressBar.visibility = View.GONE +// } hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, "")) 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 8a2d536..747b6af 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 @@ -423,7 +423,7 @@ class HemoCubeViewModel @Inject constructor( testDetails!!.reportUploadTime = SimpleDateFormat( "yyyy-MM-dd HH:mm:ss", Locale.getDefault() ).format(Calendar.getInstance().time) - + hemoCubeDao.insertAll(testDetails) // when (val response = repository.addTestToDatabase(testDetails)) { // is Response.Success -> { // val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)