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/WeekSelectActivity.kt | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/dollearn/student/ui/home/WeekSelectActivity.kt b/app/src/main/java/com/dollearn/student/ui/home/WeekSelectActivity.kt
index f2ac65e..fc273e8 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/WeekSelectActivity.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/WeekSelectActivity.kt
@@ -1,8 +1,11 @@
package com.dollearn.student.ui.home
+import androidx.core.os.bundleOf
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
+import cn.sinata.xldutils.utils.showAllowingStateLoss
import com.dollearn.student.R
+import com.dollearn.student.dialog.TipDialog
import com.dollearn.student.network.HttpManager
import com.dollearn.student.network.entity.Week
import com.dollearn.student.network.request
@@ -28,17 +31,22 @@
}
weekAdapter.setOnItemClickListener { view, position ->
- startActivity<ScheduleActivity>("week" to weeks[position].week,"season" to seasonAdapter.checked+1)
+ if (weeks[position].canStudy)
+ startActivity<ScheduleActivity>("week" to weeks[position].week,"season" to seasonAdapter.checked+1)
+ else{
+ val msg = if (seasonAdapter.checked == 0||weeks[0].canStudy) "请先完成上一周目学习后再试" else "请先完成上一季度学习后再试"
+ val tipDialog = TipDialog()
+ tipDialog.arguments = bundleOf("msg" to msg,"isAlert" to true)
+ tipDialog.showAllowingStateLoss(supportFragmentManager,"noStart")
+ }
}
}
override fun initView() {
rv_season.layoutManager = LinearLayoutManager(this)
rv_season.adapter = seasonAdapter
-
rv_week.layoutManager = GridLayoutManager(this,3)
rv_week.adapter = weekAdapter
- getWeeks()
}
private fun getWeeks(){
@@ -49,4 +57,9 @@
weekAdapter.notifyDataSetChanged()
}
}
+
+ override fun onResume() {
+ super.onResume()
+ getWeeks()
+ }
}
--
Gitblit v1.7.1