Browse Source

1.添加获取moca试题库module

王鹏鹏 2 years ago
parent
commit
e83d17172d

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

@@ -24,7 +24,7 @@ class IdentifyResultFragment : BaseFragment<FragmentIdentifyResultBinding>() {
     private val adapter by lazy { ChoiceAdapter() }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        questionId = arguments?.getInt("questionId") ?: 33
+        questionId = arguments?.getInt("questionId") ?: 41
         super.onCreate(savedInstanceState)
     }
 

+ 10 - 8
moca/src/main/java/com/yingyangfly/moca/record/ListenRecordFragment.kt

@@ -18,13 +18,11 @@ 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
+        questionId = arguments?.getInt("questionId") ?: 44
         super.onCreate(savedInstanceState)
     }
 
@@ -36,7 +34,7 @@ class ListenRecordFragment : BaseFragment<FragmentListenRecordBinding>() {
     override fun initListener() {
         binding {
             btnPrevious.setOnSingleClickListener {
-                if (number == 1) {
+                if (questionId == 44) {
                     val controller = Navigation.findNavController(it)
                     val bundle = bundleOf("questionId" to 41)
                     controller.navigate(
@@ -44,14 +42,18 @@ class ListenRecordFragment : BaseFragment<FragmentListenRecordBinding>() {
                         bundle
                     )
                 } else {
-                    number--
-                    loadData()
+                    val controller = Navigation.findNavController(it)
+                    val bundle = bundleOf("questionId" to 44)
+                    controller.navigate(
+                        R.id.action_listenRecordFragment_to_recordResultFragment,
+                        bundle
+                    )
                 }
             }
 
             btnNext.setOnSingleClickListener {
                 val controller = Navigation.findNavController(it)
-                val bundle = bundleOf("questionId" to 44, "number" to number)
+                val bundle = bundleOf("questionId" to questionId)
                 controller.navigate(
                     R.id.action_listenRecordFragment_to_recordResultFragment,
                     bundle
@@ -77,7 +79,7 @@ class ListenRecordFragment : BaseFragment<FragmentListenRecordBinding>() {
      * 加载数据
      */
     private fun loadData() {
-        binding.tvTitle.text = if (number == 1) {
+        binding.tvTitle.text = if (questionId == 44) {
             "下面您将听到几个词,请您仔细听并努力记住这些词,等一下要问您,请听题"
         } else {
             "下面将再给您听一遍刚才的几个词,请您仔细听并努力记住这些词,等一下要问您,请听题"

+ 4 - 6
moca/src/main/java/com/yingyangfly/moca/record/RecordResultFragment.kt

@@ -20,13 +20,11 @@ class RecordResultFragment : BaseFragment<FragmentRecordResultBinding>() {
      * 问题id
      */
     private var questionId = 0
-    private var number = 0
     private val choiceItemList = mutableListOf<QuestionsBean>()
     private val adapter by lazy { ChoiceAdapter() }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        questionId = arguments?.getInt("questionId") ?: 33
-        number = arguments?.getInt("number") ?: 1
+        questionId = arguments?.getInt("questionId") ?: 44
         super.onCreate(savedInstanceState)
     }
 
@@ -45,7 +43,7 @@ class RecordResultFragment : BaseFragment<FragmentRecordResultBinding>() {
         binding {
             btnPrevious.setOnSingleClickListener {
                 val controller = Navigation.findNavController(it)
-                val bundle = bundleOf("questionId" to 44, "number" to number)
+                val bundle = bundleOf("questionId" to questionId)
                 controller.navigate(
                     R.id.action_recordResultFragment_to_listenRecordFragment,
                     bundle
@@ -54,9 +52,9 @@ class RecordResultFragment : BaseFragment<FragmentRecordResultBinding>() {
 
             btnNext.setOnSingleClickListener {
                 if (judge()) {
-                    if (number == 1) {
+                    if (questionId == 44) {
                         val controller = Navigation.findNavController(it)
-                        val bundle = bundleOf("questionId" to 44, "number" to 2)
+                        val bundle = bundleOf("questionId" to 78)
                         controller.navigate(
                             R.id.action_recordResultFragment_to_listenRecordFragment,
                             bundle