From a036ac0c6c8d87f36e68f88f05231c3be23fcc4b Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期四, 01 八月 2024 13:32:55 +0800
Subject: [PATCH] 修改bug
---
app/src/main/java/com/dollearn/student/ui/home/IncludeActivity.kt | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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..e8abb61 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,10 +14,14 @@
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
+import com.dollearn.student.utils.Const
+import com.dollearn.student.utils.event.EmptyEvent
import kotlinx.android.synthetic.main.activity_listen.*
+import org.greenrobot.eventbus.EventBus
class IncludeActivity:TransparentStatusBarActivity() {
override fun setContentView() = R.layout.activity_listen
@@ -116,7 +120,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
}
@@ -127,13 +133,17 @@
tipDialog.arguments = bundleOf("msg" to "未完成全部答题，确认退出吗？")
tipDialog.setCallback(object :TipDialog.OnClickCallback{
override fun onOk() {
- 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){ _, _->
- finish()
+ 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()
}
}
@@ -145,6 +155,7 @@
override fun onDestroy() {
super.onDestroy()
+ EventBus.getDefault().post(EmptyEvent(Const.EventCode.STOP_TIMER))
handler?.removeMessages(0)
handler = null
}
--
Gitblit v1.7.1