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

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

@@ -74,16 +74,10 @@ class InputFragment : BaseFragment<FragmentInputBinding>() {
         binding {
             //上一页
             btnPrevious.setOnSingleClickListener { view ->
-                if (questionId == 4) {
-                    //跳转第二道题目
-                    questionId--
-                    val bundle = bundleOf("questionId" to questionId)
-                    val controller = Navigation.findNavController(view)
-                    controller.navigate(R.id.action_inputFragment_to_selectedItemFragment, bundle)
-                } else {
-                    questionId--
-                    loadData()
-                }
+                questionId--
+                val bundle = bundleOf("questionId" to questionId)
+                val controller = Navigation.findNavController(view)
+                controller.navigate(R.id.action_inputFragment_to_selectedItemFragment, bundle)
             }
             //下一页
             btnNext.setOnSingleClickListener { view ->
@@ -96,13 +90,9 @@ class InputFragment : BaseFragment<FragmentInputBinding>() {
                         dao?.update(question!!)
                     }
                     questionId++
-                    if (questionId < 6) {
-                        loadData()
-                    } else {
-                        val bundle = bundleOf("questionId" to questionId)
-                        val controller = Navigation.findNavController(view)
-                        controller.navigate(R.id.action_inputFragment_to_judgmentFragment, bundle)
-                    }
+                    val bundle = bundleOf("questionId" to questionId)
+                    val controller = Navigation.findNavController(view)
+                    controller.navigate(R.id.action_inputFragment_to_selectedItemFragment, bundle)
                 }
             }
         }

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

@@ -15,7 +15,7 @@ import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.mmse.adapter.SelectedItemAdapter
 
 /**
- * 单选类
+ * 季节/星期单选类
  */
 class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
 
@@ -53,13 +53,19 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
     override fun initListener() {
         binding {
             btnPrevious.setOnSingleClickListener { view ->
-                if (questionId == 2) {
-                    //跳转第一道题目
+                if (questionId == 5) {
+                    questionId--
+                    val bundle = bundleOf("questionId" to questionId)
                     val controller = Navigation.findNavController(view)
-                    controller.navigate(R.id.action_selectedItemFragment_to_yearFragment)
+                    controller.navigate(R.id.action_selectedItemFragment_to_inputFragment, bundle)
                 } else {
-                    questionId--
-                    loadData()
+                    if (questionId == 2) {
+                        val controller = Navigation.findNavController(view)
+                        controller.navigate(R.id.action_selectedItemFragment_to_yearFragment)
+                    } else {
+                        questionId--
+                        loadData()
+                    }
                 }
             }
 
@@ -69,17 +75,27 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
                         val str = "请选择" + question!!.reviewItem
                         str.toast()
                     } else {
-                        questionId++
-                        if (questionId == 3) {
-                            loadData()
-                        } else {
-                            //跳转下一道题目
+                        if (questionId == 5) {
+                            questionId++
                             val bundle = bundleOf("questionId" to questionId)
                             val controller = Navigation.findNavController(view)
                             controller.navigate(
-                                R.id.action_selectedItemFragment_to_inputFragment,
+                                R.id.action_selectedItemFragment_to_judgmentFragment,
                                 bundle
                             )
+                        } else {
+                            questionId++
+                            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
+                                )
+                            }
                         }
                     }
                 }
@@ -108,24 +124,36 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
             }
         }
         itemList.clear()
-        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("十二月")
+        when (questionId) {
+            2 -> {
+                itemList.add("春季")
+                itemList.add("夏季")
+                itemList.add("秋季")
+                itemList.add("冬季")
+            }
+            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("十二月")
+            }
+            5 -> {
+                itemList.add("星期一")
+                itemList.add("星期二")
+                itemList.add("星期三")
+                itemList.add("星期四")
+                itemList.add("星期五")
+                itemList.add("星期六")
+                itemList.add("星期日")
+            }
         }
         selectedAdapter.setData(itemList)
     }

mmse/src/main/res/navigation/nav_home.xml

@@ -16,6 +16,10 @@
         <action
             android:id="@+id/action_selectedItemFragment_to_inputFragment"
             app:destination="@id/inputFragment" />
+
+        <action
+            android:id="@+id/action_selectedItemFragment_to_judgmentFragment"
+            app:destination="@id/judgmentFragment" />
     </fragment>
     <fragment
         android:id="@+id/yearFragment"