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/ListenActivity.kt | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt b/app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt
index 4535479..3c4197e 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt
@@ -17,8 +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.jetbrains.anko.startActivity
+import org.greenrobot.eventbus.EventBus
class ListenActivity:TransparentStatusBarActivity() {
override fun setContentView() = R.layout.activity_listen
@@ -43,8 +45,9 @@
override fun initClick() {
tv_last.setOnClickListener {
- (fragments[view_pager.currentItem-1] as ListenFragment).recover()
- view_pager.setCurrentItem(view_pager.currentItem-1,true)
+ val i = view_pager.currentItem - 1
+ (fragments[i] as ListenFragment).recover()
+ view_pager.setCurrentItem(i,i%4 == 0)
if (view_pager.currentItem == 0)
tv_last.gone()
}
@@ -60,8 +63,9 @@
ResultActivity.startResult(this,day,week,season,1,totalCount,rightCount,data!!.data.integral,time,data!!.data.id)
finish()
}else{
- (fragments[view_pager.currentItem+1] as ListenFragment).recover()
- view_pager.setCurrentItem(view_pager.currentItem+1,true)
+ val i = view_pager.currentItem + 1
+ (fragments[i] as ListenFragment).recover()
+ view_pager.setCurrentItem(i,i%4 == 0)
tv_last.visible()
}
}
@@ -119,7 +123,9 @@
private fun recover(){
HttpManager.teamSchedule(day,week,1).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,13 +136,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,1,data?.data?.id?:"", list.joinToString(",") { it.id }).request(this@ListenActivity){_,_->
finish()
- else{
- val list = (data?.subjectList?: arrayListOf()).flatMap { it }.subList(0,view_pager.currentItem)
- HttpManager.exitLearning(totalCount,rightCount,day,week,1,data?.data?.id?:"", list.joinToString(",") { it.id }).request(this@ListenActivity){_,_->
- finish()
- }
}
}
@@ -150,5 +152,6 @@
super.onDestroy()
handler?.removeMessages(0)
handler = null
+ EventBus.getDefault().post(EmptyEvent(Const.EventCode.STOP_TIMER))
}
}
--
Gitblit v1.7.1