From b13afc751dbbce24753d008f1f87d2c5e133a4ad Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 09 七月 2024 15:19:26 +0800
Subject: [PATCH] fix bug
---
app/src/main/java/com/dollearn/student/ui/home/ResultActivity.kt | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 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 ab565eb..02ea593 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
@@ -1,6 +1,9 @@
package com.dollearn.student.ui.home
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
import com.dollearn.student.network.HttpManager
@@ -17,6 +20,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) }
@@ -25,10 +29,15 @@
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>()
+ }
+
+ tv_back.setOnClickListener {
startActivity<MainActivity>()
}
@@ -39,20 +48,59 @@
}
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.invisible()
+ tv_exit.invisible()
+ HttpManager.gameAchievement(rate,difficulty,id?:"","超级听力",time).request(this){_,data->
+ tv_score.text = "恭喜你，已完成全部答题！获得${data?:0}积分！"
- HttpManager.completeLearning(rate,time,day,week,season,type,id?:"").request(this){_,data->
+ }
+ }
+ 7->{
+ title = "超级记忆"
+ tv_score.text = "恭喜你，已完成游戏！获得${score}积分！"
+ tv_back.visible()
+ tv_last.invisible()
+ tv_exit.invisible()
+ HttpManager.gameAchievement(rate,difficulty,id?:"","超级记忆",time).request(this){_,data->
+ tv_score.text = "恭喜你，已完成全部答题！获得${data?:0}积分！"
+ }
+ }
+ 8->{
+ tv_back.visible()
+ tv_last.invisible()
+ tv_exit.invisible()
+ HttpManager.completeStory(rate,1,id?:"",time).request(this){_,data->
+ tv_score.text = "恭喜你，已完成全部答题！获得${data?:0}积分！"
+
+ }
+ }
+ else->{
+ if (type == 5){
+ title = "音图相配"
+ 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}积分！"
+ }
+ }
}
}
companion object{
- fun startResult(context:Context,day:Int,week:Int,season:Int,type:Int,total:Int,right:Int,score:Int,time:Int,id:String){
- context.startActivity<ResultActivity>("day" to day,"week" to week,"season" to season,"type" to type,"total" to total,"right" to right,"score" to score,"time" to time,"id" to id)
+ fun startResult(context:Context,day:Int,week:Int,season:Int,type:Int,total:Int,right:Int,score:Int,time:Int,id:String,difficulty:Int? = null){
+ context.startActivity<ResultActivity>("day" to day,"week" to week,"season" to season,"type" to type,"total" to total,"right" to right,"score" to score,
+ "time" to time,"id" to id,"difficulty" to difficulty)
}
}
}
--
Gitblit v1.7.1