|
@@ -23,7 +23,7 @@ class MemorizeNumbersFragment : BaseFragment<FragmentMemorizeNumbersBinding>() {
|
|
|
private var question: QuestionsBean? = null
|
|
|
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
- questionId = arguments?.getInt("questionId") ?: 44
|
|
|
+ questionId = arguments?.getInt("questionId") ?: 49
|
|
|
super.onCreate(savedInstanceState)
|
|
|
}
|
|
|
|
|
@@ -40,16 +40,25 @@ class MemorizeNumbersFragment : BaseFragment<FragmentMemorizeNumbersBinding>() {
|
|
|
}
|
|
|
}
|
|
|
btnPrevious.setOnSingleClickListener {
|
|
|
- val controller = Navigation.findNavController(it)
|
|
|
- val bundle = bundleOf("questionId" to 78)
|
|
|
- controller.navigate(
|
|
|
- R.id.action_memorizeNumbersFragment_to_recordResultFragment,
|
|
|
- bundle
|
|
|
- )
|
|
|
+ if (questionId == 49) {
|
|
|
+ val controller = Navigation.findNavController(it)
|
|
|
+ val bundle = bundleOf("questionId" to 78)
|
|
|
+ controller.navigate(
|
|
|
+ R.id.action_memorizeNumbersFragment_to_recordResultFragment,
|
|
|
+ bundle
|
|
|
+ )
|
|
|
+ } else {
|
|
|
+ val controller = Navigation.findNavController(it)
|
|
|
+ val bundle = bundleOf("questionId" to 49)
|
|
|
+ controller.navigate(
|
|
|
+ R.id.action_memorizeNumbersFragment_to_memorizeResultFragment,
|
|
|
+ bundle
|
|
|
+ )
|
|
|
+ }
|
|
|
}
|
|
|
btnNext.setOnSingleClickListener {
|
|
|
val controller = Navigation.findNavController(it)
|
|
|
- val bundle = bundleOf("questionId" to 49)
|
|
|
+ val bundle = bundleOf("questionId" to questionId)
|
|
|
controller.navigate(
|
|
|
R.id.action_memorizeNumbersFragment_to_memorizeResultFragment,
|
|
|
bundle
|
|
@@ -71,6 +80,11 @@ class MemorizeNumbersFragment : BaseFragment<FragmentMemorizeNumbersBinding>() {
|
|
|
* 加载数据
|
|
|
*/
|
|
|
private fun loadData() {
|
|
|
+ binding.tvTitle.text = if (questionId == 49) {
|
|
|
+ "下面给您听一些数字,听完后请按照顺序背出来请听题"
|
|
|
+ } else {
|
|
|
+ "下面再给您听一些数字,听完后请从后往前倒着背出来,请听题"
|
|
|
+ }
|
|
|
if (dao != null) {
|
|
|
question = dao?.getQuestion(questionId)
|
|
|
}
|