|
@@ -23,11 +23,6 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
|
|
|
*/
|
|
|
var questionId = 0
|
|
|
|
|
|
- /**
|
|
|
- * 翻页问题id
|
|
|
- */
|
|
|
- var nextQuestionId = 0
|
|
|
-
|
|
|
var question: QuestionsBean? = null
|
|
|
|
|
|
private val itemList = mutableListOf<String>()
|
|
@@ -35,7 +30,6 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
|
|
|
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
questionId = arguments?.getInt("questionId") ?: 2
|
|
|
- nextQuestionId = arguments?.getInt("questionId") ?: 2
|
|
|
super.onCreate(savedInstanceState)
|
|
|
}
|
|
|
|
|
@@ -58,14 +52,9 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
|
|
|
override fun initListener() {
|
|
|
binding {
|
|
|
btnPrevious.setOnSingleClickListener { view ->
|
|
|
- if (questionId == nextQuestionId) {
|
|
|
- //跳转第一道题目
|
|
|
- val controller = Navigation.findNavController(view)
|
|
|
- controller.navigate(R.id.action_selectedItemFragment_to_yearFragment)
|
|
|
- } else {
|
|
|
- nextQuestionId--
|
|
|
- loadData()
|
|
|
- }
|
|
|
+ //跳转第一道题目
|
|
|
+ val controller = Navigation.findNavController(view)
|
|
|
+ controller.navigate(R.id.action_selectedItemFragment_to_yearFragment)
|
|
|
}
|
|
|
|
|
|
btnNext.setOnSingleClickListener {
|
|
@@ -74,12 +63,9 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
|
|
|
val str = "请选择" + question!!.reviewItem
|
|
|
str.toast()
|
|
|
} else {
|
|
|
- nextQuestionId++
|
|
|
- if (nextQuestionId == 3) {
|
|
|
- loadData()
|
|
|
- } else {
|
|
|
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -100,32 +86,17 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
|
|
|
*/
|
|
|
private fun loadData() {
|
|
|
if (dao != null) {
|
|
|
- question = dao?.getQuestion(nextQuestionId)
|
|
|
+ question = dao?.getQuestion(questionId)
|
|
|
if (question != null) {
|
|
|
binding.data = question
|
|
|
selectedAdapter.selectedData = question!!.inputString
|
|
|
}
|
|
|
}
|
|
|
itemList.clear()
|
|
|
- if (nextQuestionId == 2) {
|
|
|
- itemList.add("春季")
|
|
|
- itemList.add("夏季")
|
|
|
- itemList.add("秋季")
|
|
|
- itemList.add("冬季")
|
|
|
- } else if (nextQuestionId == 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("十二月")
|
|
|
- }
|
|
|
+ itemList.add("春季")
|
|
|
+ itemList.add("夏季")
|
|
|
+ itemList.add("秋季")
|
|
|
+ itemList.add("冬季")
|
|
|
selectedAdapter.setData(itemList)
|
|
|
}
|
|
|
}
|