From c303346ae803dc2a89ec0f025192773211861915 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 16 七月 2024 14:46:28 +0800
Subject: [PATCH] fix bug
---
app/src/main/java/com/dollearn/student/ui/home/IncludeActivity.kt | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 63c7a13..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
@@ -18,7 +18,10 @@
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
@@ -130,21 +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?.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)
- }
+ 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()
- }
+ }
+ HttpManager.exitLearning(view_pager.currentItem,season,time,totalCount,rightCount,day,week,3,data?.data?.id?:"", arrayListOf.joinToString(",") { it.id }).request(this@IncludeActivity){ _, _->
+ finish()
}
}
@@ -156,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