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/IncludeActivity.kt | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/dollearn/student/ui/home/IncludeActivity.kt b/app/src/main/java/com/dollearn/student/ui/home/IncludeActivity.kt
index 48e1bef..63c7a13 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/IncludeActivity.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/IncludeActivity.kt
@@ -14,6 +14,7 @@
import com.dollearn.student.R
import com.dollearn.student.dialog.TipDialog
import com.dollearn.student.network.HttpManager
+import com.dollearn.student.network.entity.Subject
import com.dollearn.student.network.entity.SubjectBean
import com.dollearn.student.network.request
import com.dollearn.student.ui.TransparentStatusBarActivity
@@ -116,7 +117,9 @@
private fun recover(){
HttpManager.teamSchedule(day,week,3).request(this){_,data->
- view_pager.setCurrentItem(data?.topicIds?.size?:0,false)
+ view_pager.setCurrentItem((data?.schedule?:1)-1,false)
+ if (view_pager.currentItem != 0)
+ tv_last.visible()
totalCount = data?.answerNumber?:0
rightCount = data?.correctNumber?:0
}
@@ -130,8 +133,16 @@
if (view_pager.currentItem == 0)
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@IncludeActivity){ _, _->
+ val list = (data?.subjectList?.subList(0,view_pager.currentItem))
+ val arrayListOf = arrayListOf<Subject>()
+ list?.forEach { it ->
+ it.forEachIndexed { index, subject ->
+ if (index == 2||index == 4||index == 5){
+ arrayListOf.add(subject)
+ }
+ }
+ }
+ HttpManager.exitLearning(view_pager.currentItem,season,time,totalCount,rightCount,day,week,3,data?.data?.id?:"", arrayListOf.joinToString(",") { it.id }).request(this@IncludeActivity){ _, _->
finish()
}
}
--
Gitblit v1.7.1