1.添加获取mmse试题库UI跳转

mmse/src/main/java/com/yingyangfly/mmse/fragment/InputFragment.kt

@@ -22,11 +22,6 @@ class InputFragment : BaseFragment<FragmentInputBinding>() {
      */
     var questionId = 0
 
-    /**
-     * 翻页问题id
-     */
-    var nextQuestionId = 0
-
     private var toastInfo = ""
     private val numberList = mutableListOf<String>()
     private val numberAdapter by lazy { NumberAdapter() }
@@ -34,8 +29,7 @@ class InputFragment : BaseFragment<FragmentInputBinding>() {
     var question: QuestionsBean? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        questionId = arguments?.getInt("questionId") ?: 3
-        nextQuestionId = arguments?.getInt("questionId") ?: 3
+        questionId = arguments?.getInt("questionId") ?: 4
         super.onCreate(savedInstanceState)
     }
 
@@ -80,12 +74,14 @@ class InputFragment : BaseFragment<FragmentInputBinding>() {
         binding {
             //上一页
             btnPrevious.setOnSingleClickListener { view ->
-                if (questionId == nextQuestionId) {
+                if (questionId == 4) {
                     //跳转第二道题目
+                    questionId--
+                    val bundle = bundleOf("questionId" to questionId)
                     val controller = Navigation.findNavController(view)
-                    controller.navigate(R.id.action_inputFragment_to_selectedItemFragment)
+                    controller.navigate(R.id.action_inputFragment_to_selectedItemFragment, bundle)
                 } else {
-                    nextQuestionId--
+                    questionId--
                     loadData()
                 }
             }
@@ -99,11 +95,11 @@ class InputFragment : BaseFragment<FragmentInputBinding>() {
                         question!!.inputString = stringBuffer.toString()
                         dao?.update(question!!)
                     }
-                    nextQuestionId++
-                    if (nextQuestionId < 6) {
+                    questionId++
+                    if (questionId < 6) {
                         loadData()
                     } else {
-                        val bundle = bundleOf("questionId" to nextQuestionId)
+                        val bundle = bundleOf("questionId" to questionId)
                         val controller = Navigation.findNavController(view)
                         controller.navigate(R.id.action_inputFragment_to_judgmentFragment, bundle)
                     }
@@ -130,7 +126,7 @@ class InputFragment : BaseFragment<FragmentInputBinding>() {
                 val length = stringBuffer.length
                 stringBuffer.delete(0, length)
             }
-            question = dao?.getQuestion(nextQuestionId)
+            question = dao?.getQuestion(questionId)
             if (question != null) {
                 binding.data = question
                 toastInfo = question!!.reviewItem

mmse/src/main/java/com/yingyangfly/mmse/fragment/SelectedItemFragment.kt

@@ -53,9 +53,14 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
     override fun initListener() {
         binding {
             btnPrevious.setOnSingleClickListener { view ->
-                //跳转第一道题目
-                val controller = Navigation.findNavController(view)
-                controller.navigate(R.id.action_selectedItemFragment_to_yearFragment)
+                if (questionId == 2) {
+                    //跳转第一道题目
+                    val controller = Navigation.findNavController(view)
+                    controller.navigate(R.id.action_selectedItemFragment_to_yearFragment)
+                } else {
+                    questionId--
+                    loadData()
+                }
             }
 
             btnNext.setOnSingleClickListener { view ->
@@ -64,11 +69,18 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
                         val str = "请选择" + question!!.reviewItem
                         str.toast()
                     } else {
-                        //跳转下一道题目
                         questionId++
-                        val bundle = bundleOf("questionId" to questionId)
-                        val controller = Navigation.findNavController(view)
-                        controller.navigate(R.id.action_selectedItemFragment_to_inputFragment, bundle)
+                        if (questionId == 3) {
+                            loadData()
+                        } else {
+                            //跳转下一道题目
+                            val bundle = bundleOf("questionId" to questionId)
+                            val controller = Navigation.findNavController(view)
+                            controller.navigate(
+                                R.id.action_selectedItemFragment_to_inputFragment,
+                                bundle
+                            )
+                        }
                     }
                 }
             }
@@ -96,10 +108,25 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
             }
         }
         itemList.clear()
-        itemList.add("春季")
-        itemList.add("夏季")
-        itemList.add("秋季")
-        itemList.add("冬季")
+        if (questionId == 2) {
+            itemList.add("春季")
+            itemList.add("夏季")
+            itemList.add("秋季")
+            itemList.add("冬季")
+        } else if (questionId == 3) {
+            itemList.add("一月")
+            itemList.add("二月")
+            itemList.add("三月")
+            itemList.add("四月")
+            itemList.add("五月")
+            itemList.add("六月")
+            itemList.add("七月")
+            itemList.add("八月")
+            itemList.add("九月")
+            itemList.add("十月")
+            itemList.add("十一月")
+            itemList.add("十二月")
+        }
         selectedAdapter.setData(itemList)
     }
 }