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/MatchActivity.kt | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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 cb85d61..a16508e 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 @@ -17,7 +17,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 MatchActivity:TransparentStatusBarActivity() { override fun setContentView() = R.layout.activity_listen @@ -129,13 +132,9 @@ tipDialog.arguments = bundleOf("msg" to "未完成全部答题,确认退出吗?") tipDialog.setCallback(object :TipDialog.OnClickCallback{ override fun onOk() { - if (view_pager.currentItem == 0) + val list = (data?.subjectList?: arrayListOf()).flatMap { it }.subList(0,view_pager.currentItem) + HttpManager.exitLearning(view_pager.currentItem,season,time,totalCount,rightCount,day,week,5,data?.data?.id?:"", list.joinToString(",") { it.id }).request(this@MatchActivity){ _, _-> finish() - else{ - val list = (data?.subjectList?: arrayListOf()).flatMap { it }.subList(0,view_pager.currentItem) - HttpManager.exitLearning(view_pager.currentItem,season,time,totalCount,rightCount,day,week,5,data?.data?.id?:"", list.joinToString(",") { it.id }).request(this@MatchActivity){ _, _-> - finish() - } } } @@ -149,5 +148,6 @@ super.onDestroy() handler?.removeMessages(0) handler = null + EventBus.getDefault().post(EmptyEvent(Const.EventCode.STOP_TIMER)) } } -- Gitblit v1.7.1