Преглед на файлове

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

王鹏鹏 преди 2 години
родител
ревизия
c623269ee1

+ 20 - 8
mmse/src/main/java/com/yingyangfly/mmse/fragment/InputFragment.kt

@@ -29,7 +29,7 @@ class InputFragment : BaseFragment<FragmentInputBinding>() {
     var question: QuestionsBean? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        questionId = arguments?.getInt("questionId") ?: 4
+        questionId = arguments?.getInt("questionId") ?: 3
         super.onCreate(savedInstanceState)
     }
 
@@ -78,9 +78,13 @@ class InputFragment : BaseFragment<FragmentInputBinding>() {
             //上一页
             btnPrevious.setOnSingleClickListener { view ->
                 questionId--
-                val bundle = bundleOf("questionId" to questionId)
-                val controller = Navigation.findNavController(view)
-                controller.navigate(R.id.action_inputFragment_to_selectedItemFragment, bundle)
+                if (questionId == 3) {
+                    loadData()
+                } else {
+                    val bundle = bundleOf("questionId" to questionId)
+                    val controller = Navigation.findNavController(view)
+                    controller.navigate(R.id.action_inputFragment_to_selectedItemFragment, bundle)
+                }
             }
             //下一页
             btnNext.setOnSingleClickListener { view ->
@@ -95,10 +99,18 @@ class InputFragment : BaseFragment<FragmentInputBinding>() {
                         question!!.correct = ""
                         dao?.update(question!!)
                     }
-                    questionId++
-                    val bundle = bundleOf("questionId" to questionId)
-                    val controller = Navigation.findNavController(view)
-                    controller.navigate(R.id.action_inputFragment_to_selectedItemFragment, bundle)
+                    if (questionId == 3) {
+                        questionId++
+                        loadData()
+                    } else {
+                        questionId++
+                        val bundle = bundleOf("questionId" to questionId)
+                        val controller = Navigation.findNavController(view)
+                        controller.navigate(
+                            R.id.action_inputFragment_to_selectedItemFragment,
+                            bundle
+                        )
+                    }
                 }
             }
         }

+ 8 - 26
mmse/src/main/java/com/yingyangfly/mmse/fragment/SelectedItemFragment.kt

@@ -20,7 +20,7 @@ import com.yingyangfly.mmse.adapter.SelectedItemAdapter
 class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
 
     /**
-     * 原始问题id (2.3) (5)
+     * 原始问题id (2) (5)
      */
     var questionId = 0
 
@@ -88,17 +88,13 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
                             )
                         } 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
-                                )
-                            }
+                            //跳转下一道题目
+                            val bundle = bundleOf("questionId" to questionId)
+                            val controller = Navigation.findNavController(view)
+                            controller.navigate(
+                                R.id.action_selectedItemFragment_to_inputFragment,
+                                bundle
+                            )
                         }
                     }
                 }
@@ -134,20 +130,6 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
                 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("星期二")