From b13afc751dbbce24753d008f1f87d2c5e133a4ad Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 09 七月 2024 15:19:26 +0800
Subject: [PATCH] fix bug
---
app/src/main/java/com/dollearn/student/ui/home/MatchActivity.kt | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/dollearn/student/ui/home/MatchActivity.kt b/app/src/main/java/com/dollearn/student/ui/home/MatchActivity.kt
index 19d4c00..cb85d61 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/MatchActivity.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/MatchActivity.kt
@@ -41,7 +41,7 @@
override fun initClick() {
tv_last.setOnClickListener {
- (fragments[view_pager.currentItem-1] as IncludeFragment).recover()
+ (fragments[view_pager.currentItem-1] as MatchFragment).recover()
view_pager.setCurrentItem(view_pager.currentItem-1,true)
if (view_pager.currentItem == 0)
tv_last.gone()
@@ -55,10 +55,10 @@
fun next(){
if (view_pager.currentItem == fragments.lastIndex){
handler?.removeMessages(0)
- ResultActivity.startResult(this,day,week,season,3,totalCount,rightCount,data!!.data.integral,time,data!!.data.id)
+ ResultActivity.startResult(this,day,week,season,5,totalCount,rightCount,data!!.data.integral,time,data!!.data.id)
finish()
}else{
- (fragments[view_pager.currentItem+1] as IncludeFragment).recover()
+ (fragments[view_pager.currentItem+1] as MatchFragment).recover()
view_pager.setCurrentItem(view_pager.currentItem+1,true)
tv_last.visible()
}
@@ -68,7 +68,7 @@
data?.apply {
tv_progress.text = "已完成：1/${subjectList.size}"
subjectList.forEachIndexed { index, subject ->
- fragments.add(IncludeFragment.getInstance(index))
+ fragments.add(MatchFragment.getInstance(index))
}
view_pager.adapter = @SuppressLint("WrongConstant")
object : FragmentPagerAdapter(supportFragmentManager,0) {
@@ -115,8 +115,10 @@
}
private fun recover(){
- HttpManager.teamSchedule(day,week,3).request(this){_,data->
- view_pager.setCurrentItem(data?.topicIds?.size?:0,false)
+ HttpManager.teamSchedule(day,week,5).request(this){_,data->
+ view_pager.setCurrentItem((data?.schedule?:1)-1,false)
+ if (view_pager.currentItem != 0)
+ tv_last.visible()
totalCount = data?.answerNumber?:0
rightCount = data?.correctNumber?:0
}
@@ -131,7 +133,7 @@
finish()
else{
val list = (data?.subjectList?: arrayListOf()).flatMap { it }.subList(0,view_pager.currentItem)
- HttpManager.exitLearning(totalCount,rightCount,day,week,3,data?.data?.id?:"", list.joinToString(",") { it.id }).request(this@MatchActivity){ _, _->
+ HttpManager.exitLearning(view_pager.currentItem,season,time,totalCount,rightCount,day,week,5,data?.data?.id?:"", list.joinToString(",") { it.id }).request(this@MatchActivity){ _, _->
finish()
}
}
--
Gitblit v1.7.1