From 855a7e18a795f0db2453a19e3e8f26ba2ff553b4 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期四, 29 五月 2025 16:32:41 +0800
Subject: [PATCH] UI调整
---
app/src/main/java/com/dollearn/student/ui/home/DailyFragment.kt | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 45b33db..7d53594 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
@@ -35,9 +35,7 @@
private val week by lazy {
(requireActivity() as ScheduleActivity).week
}
- private val current by lazy {
- (requireActivity() as ScheduleActivity).currentDay
- }
+
override fun onFirstVisibleToUser() {
getProgress()
@@ -113,13 +111,17 @@
private fun getProgress(){
HttpManager.studySchedule(week,day).requestByF(this){ _, data->
data?.apply {
+ val scheduleActivity = activity as ScheduleActivity
+ if (day != scheduleActivity.currentDay){ //解锁了后一天
+ scheduleActivity.unLockNext(day)
+ }
tv_current.text = "当前周目：${week.formatToChinese()}周目"
tv_progress.text = "${computeSchedule}%"
tv_total.text = "${totalStudy}小时"
tv_today.text = "${todayStudy}小时"
progress_bar.progress = computeSchedule
- if (this@DailyFragment.day == current){
+ if (this@DailyFragment.day == scheduleActivity.currentDay){
formatProgress(listen,tv_state)
formatProgress(look,tv_state_2)
formatProgress(induction,tv_state_3)
@@ -180,7 +182,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