From cd13751df41c6504b3934cd3f1bd441c4ba172ff Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 19 七月 2024 11:38:27 +0800
Subject: [PATCH] fix bug
---
app/src/main/java/com/dollearn/student/ui/home/DailyFragment.kt | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/dollearn/student/ui/home/DailyFragment.kt b/app/src/main/java/com/dollearn/student/ui/home/DailyFragment.kt
index b305906..844eee2 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/DailyFragment.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/DailyFragment.kt
@@ -12,8 +12,12 @@
import com.dollearn.student.network.Apis
import com.dollearn.student.network.HttpManager
import com.dollearn.student.network.requestByF
+import com.dollearn.student.utils.Const
+import com.dollearn.student.utils.event.EmptyEvent
import com.dollearn.student.utils.extention.clickDelay
+import com.dollearn.student.utils.extention.formatToChinese
import kotlinx.android.synthetic.main.fragment_daily.*
+import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.backgroundResource
import org.jetbrains.anko.support.v4.browse
import org.jetbrains.anko.support.v4.startActivityForResult
@@ -41,6 +45,7 @@
showDialog("加载题目...")
HttpManager.listenSelectPicture(season, week, day).requestByF(this,false, {_,data->
startActivityForResult<ListenActivity>(1,"data" to data,"day" to day,"week" to week,"season" to season)
+ EventBus.getDefault().post(EmptyEvent(Const.EventCode.START_TIMER))
}){_,msg->
handleError(msg)
}
@@ -49,6 +54,8 @@
showDialog("加载题目...")
HttpManager.pictureSelectVoice(season, week, day).requestByF(this,false, {_,data->
startActivityForResult<ChooseVoiceActivity>(1,"data" to data,"day" to day,"week" to week,"season" to season)
+ EventBus.getDefault().post(EmptyEvent(Const.EventCode.START_TIMER))
+
}){_,msg->
handleError(msg)
}
@@ -57,6 +64,8 @@
showDialog("加载题目...")
HttpManager.induceExclude(season, week, day).requestByF(this,false, {_,data->
startActivityForResult<IncludeActivity>(1,"data" to data,"day" to day,"week" to week,"season" to season)
+ EventBus.getDefault().post(EmptyEvent(Const.EventCode.START_TIMER))
+
}){_,msg->
handleError(msg)
}
@@ -65,6 +74,8 @@
showDialog("加载题目...")
HttpManager.questionsAndAnswers(season, week, day).requestByF(this,false, {_,data->
startActivityForResult<QAActivity>(1,"data" to data,"day" to day,"week" to week,"season" to season)
+ EventBus.getDefault().post(EmptyEvent(Const.EventCode.START_TIMER))
+
}){_,msg->
handleError(msg)
}
@@ -73,6 +84,8 @@
showDialog("加载题目...")
HttpManager.pictureMateVoice(season, week, day).requestByF(this,false,{_,data->
startActivityForResult<MatchActivity>(1,"data" to data,"day" to day,"week" to week,"season" to season)
+ EventBus.getDefault().post(EmptyEvent(Const.EventCode.START_TIMER))
+
}){_,msg->
handleError(msg)
}
@@ -100,7 +113,7 @@
private fun getProgress(){
HttpManager.studySchedule(week,day).requestByF(this){ _, data->
data?.apply {
- tv_current.text = "当前周目：${week}周目"
+ tv_current.text = "当前周目：${week.formatToChinese()}周目"
tv_progress.text = "${computeSchedule}%"
tv_total.text = "${totalStudy}小时"
tv_today.text = "${todayStudy}小时"
@@ -167,7 +180,6 @@
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
- if (resultCode == Activity.RESULT_OK)
- getProgress()
+ getProgress()
}
}
--
Gitblit v1.7.1