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/ResultActivity.kt | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/com/dollearn/student/ui/home/ResultActivity.kt b/app/src/main/java/com/dollearn/student/ui/home/ResultActivity.kt
index 283da05..8c692d4 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/ResultActivity.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/ResultActivity.kt
@@ -2,6 +2,7 @@
import android.content.Context
import cn.sinata.xldutils.gone
+import cn.sinata.xldutils.invisible
import cn.sinata.xldutils.visible
import com.dollearn.student.MainActivity
import com.dollearn.student.R
@@ -9,6 +10,7 @@
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 com.dollearn.student.utils.event.IntEvent
import com.dollearn.student.utils.extention.clickDelay
import kotlinx.android.synthetic.main.activity_result.*
@@ -19,6 +21,7 @@
override fun setContentView() = R.layout.activity_result
private val id by lazy { intent.getStringExtra("id") }
+ private val time by lazy { intent.getIntExtra("time",0) }
private val type by lazy { intent.getIntExtra("type",0) }
private val day by lazy { intent.getIntExtra("day",0) }
private val week by lazy { intent.getIntExtra("week",0) }
@@ -27,17 +30,16 @@
private val total by lazy { intent.getIntExtra("total",0) }
private val right by lazy { intent.getIntExtra("right",0) }
private val score by lazy { intent.getIntExtra("score",0) }
- private val time by lazy { intent.getIntExtra("time",0) }
private val difficulty by lazy { intent.getIntExtra("difficulty",0) } //游戏难度
override fun initClick() {
tv_last.setOnClickListener {
- startActivity<MainActivity>()
+ finish()
}
tv_back.setOnClickListener {
- startActivity<MainActivity>()
+ finish()
}
tv_exit.clickDelay {
@@ -47,38 +49,63 @@
}
override fun initView() {
- tv_score.text = "恭喜你，已完成全部答题！获得${score}积分！"
tv_count.text = "${total}次"
tv_right.text = "${right}次"
tv_fault.text = "${total-right}次"
- val rate = (right * 100) / total
+ val rate = if(total == 0) 0 else (right * 100) / total
tv_rate.text = "正确率：$rate%"
when(type){
6->{
title = "超级听力"
tv_back.visible()
- tv_last.gone()
- tv_exit.gone()
+ tv_last.invisible()
+ tv_exit.invisible()
HttpManager.gameAchievement(rate,difficulty,id?:"","超级听力",time).request(this){_,data->
+ tv_score.text = "恭喜你，已完成全部答题！获得${data?:0}积分!"
+
}
}
7->{
- title = "超级记忆"
+ title = "自主游戏2-超级记忆"
+ tv_score.text = "恭喜你，已完成游戏！获得${score}积分!"
tv_back.visible()
- tv_last.gone()
- tv_exit.gone()
+ tv_last.invisible()
+ tv_exit.invisible()
+
+ tv_1.text = "总题目："
+ tv_2.text = "正确题目："
+ tv_3.text = "错误题目："
+ tv_count.text = "$total"
+ tv_right.text = "$right"
+ tv_fault.text = "${total-right}"
HttpManager.gameAchievement(rate,difficulty,id?:"","超级记忆",time).request(this){_,data->
+ tv_score.text = "恭喜你，已完成游戏！获得${data?:0}积分!"
}
}
8->{
+ title = "自主学故事1-看图配音"
tv_back.visible()
- tv_last.gone()
- tv_exit.gone()
- HttpManager.completeStory(rate,type,id?:"").request(this){_,data->
+ tv_last.invisible()
+ tv_exit.invisible()
+ HttpManager.completeStory(rate,1,id?:"",time).request(this){_,data->
+ tv_score.text = "恭喜你，已完成全部答题！获得${data?:0}积分!"
}
}
else->{
+ when(type){
+ 1-> title = "自主学习1-听音选图"
+ 2-> title = "自主学习2-看图选音"
+ 3-> title = "自主学习3-归纳排除"
+ 4-> title = "自主学习4-有问有答"
+ }
+ if (type == 5){
+ title = "自主学习5-音图相配"
+ tv_back.visible()
+ tv_last.invisible()
+ tv_exit.invisible()
+ }
HttpManager.completeLearning(rate,time,day,week,season,type,id?:"").request(this){_,data->
+ tv_score.text = "恭喜你，已完成全部答题！获得${data?:0}积分!"
}
}
}
--
Gitblit v1.7.1