Browse Source

1.添加获取moca试题库module

王鹏鹏 2 years ago
parent
commit
5503d6eca2

+ 4 - 2
moca/src/main/java/com/yingyangfly/moca/identify/IdentifyResultFragment.kt

@@ -46,9 +46,11 @@ class IdentifyResultFragment : BaseFragment<FragmentIdentifyResultBinding>() {
             }
 
             btnNext.setOnSingleClickListener {
-                if(judge()) {
+                if (judge()) {
+
+
                     val controller = Navigation.findNavController(it)
-                    val bundle = bundleOf("questionId" to 44)
+                    val bundle = bundleOf("questionId" to 44, "number" to 1)
                     controller.navigate(
                         R.id.action_identifyResultFragment_to_listenRecordFragment,
                         bundle

+ 19 - 7
moca/src/main/java/com/yingyangfly/moca/record/ListenRecordFragment.kt

@@ -18,11 +18,13 @@ class ListenRecordFragment : BaseFragment<FragmentListenRecordBinding>() {
      * 问题id
      */
     private var questionId = 0
+    private var number = 0
     private var playVoice: PlayVoice? = null
     private val words = mutableListOf<String>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         questionId = arguments?.getInt("questionId") ?: 33
+        number = arguments?.getInt("number") ?: 1
         super.onCreate(savedInstanceState)
     }
 
@@ -34,17 +36,22 @@ class ListenRecordFragment : BaseFragment<FragmentListenRecordBinding>() {
     override fun initListener() {
         binding {
             btnPrevious.setOnSingleClickListener {
-                val controller = Navigation.findNavController(it)
-                val bundle = bundleOf("questionId" to 41)
-                controller.navigate(
-                    R.id.action_listenRecordFragment_to_identifyResultFragment,
-                    bundle
-                )
+                if (number == 1) {
+                    val controller = Navigation.findNavController(it)
+                    val bundle = bundleOf("questionId" to 41)
+                    controller.navigate(
+                        R.id.action_listenRecordFragment_to_identifyResultFragment,
+                        bundle
+                    )
+                } else {
+                    number--
+                    loadData()
+                }
             }
 
             btnNext.setOnSingleClickListener {
                 val controller = Navigation.findNavController(it)
-                val bundle = bundleOf("questionId" to 44)
+                val bundle = bundleOf("questionId" to 44, "number" to number)
                 controller.navigate(
                     R.id.action_listenRecordFragment_to_recordResultFragment,
                     bundle
@@ -70,6 +77,11 @@ class ListenRecordFragment : BaseFragment<FragmentListenRecordBinding>() {
      * 加载数据
      */
     private fun loadData() {
+        binding.tvTitle.text = if (number == 1) {
+            "下面您将听到几个词,请您仔细听并努力记住这些词,等一下要问您,请听题"
+        } else {
+            "下面将再给您听一遍刚才的几个词,请您仔细听并努力记住这些词,等一下要问您,请听题"
+        }
         words.clear()
         if (dao != null) {
             val firstquestion = dao?.getQuestion(questionId)