smiuser/hpos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

TestRight related issues fixed

Browse Source
This commit is contained in:
Mariya
2023-12-08 23:11:21 +05:30
parent 825a573060
commit f39bce5786
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightActivity.kt
View File

@@ -32,7 +32,7 @@ import `in`.sminnovations.hpostesting.databinding.ActivityTestRightBinding
class TestRightActivity : AppCompatActivity() { class TestRightActivity : AppCompatActivity() {
private lateinit var binding: ActivityTestRightBinding private lateinit var binding: ActivityTestRightBinding
private val viewModel by viewModels<TestRightViewModel<Any?>>() private val viewModel by viewModels<TestRightViewModel>()
private var myMenu: Menu? = null private var myMenu: Menu? = null
private lateinit var mDriver: UsbSerialDriver private lateinit var mDriver: UsbSerialDriver

2
app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt
View File

@@ -25,7 +25,7 @@ import `in`.sminnovations.hpostesting.databinding.FragmentTestRightExpReferenceB
@AndroidEntryPoint @AndroidEntryPoint
class TestRightExpReference : Fragment() { class TestRightExpReference : Fragment() {
private lateinit var binding: FragmentTestRightExpReferenceBinding private lateinit var binding: FragmentTestRightExpReferenceBinding
private val viewModel: TestRightViewModel<Any?> by activityViewModels() private val viewModel: TestRightViewModel by activityViewModels()
private val TAG = "TestRightExpReference" private val TAG = "TestRightExpReference"
override fun onCreateView( override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?

2
app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt
View File

@@ -27,7 +27,7 @@ import `in`.sminnovations.hpostesting.databinding.FragmentTestRightExpSampleBind
class TestRightExpSample : Fragment() { class TestRightExpSample : Fragment() {
private lateinit var binding: FragmentTestRightExpSampleBinding private lateinit var binding: FragmentTestRightExpSampleBinding
private val viewModel: TestRightViewModel<Any?> by activityViewModels() private val viewModel: TestRightViewModel by activityViewModels()
private val TAG = "TestRightExpSample" private val TAG = "TestRightExpSample"

4
app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
View File

@@ -32,7 +32,7 @@ import kotlinx.coroutines.withContext
class TestRightResults : Fragment() { class TestRightResults : Fragment() {
private lateinit var binding: FragmentTestRightResultsBinding private lateinit var binding: FragmentTestRightResultsBinding
private val viewModel: TestRightViewModel<Any?> by activityViewModels() private val viewModel: TestRightViewModel by activityViewModels()
private lateinit var sharedPreference: SharedPreferences private lateinit var sharedPreference: SharedPreferences
override fun onCreateView( override fun onCreateView(
@@ -135,7 +135,7 @@ class TestRightResults : Fragment() {
} }
} }
} }
viewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable -> viewModel.networkStatusLiveData?.observe(viewLifecycleOwner) { isNetworkAvailable ->
val deviceStaticId = sharedPreference.getString(Constants.USER_ID, "") val deviceStaticId = sharedPreference.getString(Constants.USER_ID, "")
if (isNetworkAvailable) { if (isNetworkAvailable) {
viewModel.uploadResultToDatabase(requireContext(), true, deviceStaticId!!) viewModel.uploadResultToDatabase(requireContext(), true, deviceStaticId!!)

1
app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt
View File

@@ -39,7 +39,6 @@ import kotlin.math.log10
import kotlin.math.pow import kotlin.math.pow
@HiltViewModel @HiltViewModel
@ViewModelScoped
class TestRightViewModel @Inject constructor( class TestRightViewModel @Inject constructor(
private val saveRawData: SaveRawData, private val saveRawData: SaveRawData,
private val saveRawDataTest: SaveRawDataTest, private val saveRawDataTest: SaveRawDataTest,