|
@@ -41,9 +41,9 @@ class MocaActivity : BaseMVVMActivity<ActivityMocaBinding, MocaViewModel>() {
|
|
|
val minutes = time / 60
|
|
|
val seconds = time % 60
|
|
|
binding.tvTimes.text = if (minutes > 0) {
|
|
|
- minutes.toString() + "分" + seconds.toString() + "秒"
|
|
|
+ "已用时 $minutes 分$seconds 秒"
|
|
|
} else {
|
|
|
- seconds.toString() + "秒"
|
|
|
+ "已用时 $seconds 秒"
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -53,6 +53,7 @@ class MocaActivity : BaseMVVMActivity<ActivityMocaBinding, MocaViewModel>() {
|
|
|
*/
|
|
|
@Subscribe(code = RxBusCodes.EndMOCAQuestion, threadMode = ThreadMode.MAIN)
|
|
|
fun loadData() {
|
|
|
+ rxTimer.cancel()
|
|
|
if (dao != null) {
|
|
|
val questionsBeans = dao?.getAllQuestions()
|
|
|
if (questionsBeans.isNullOrEmpty().not()) {
|