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/MatchFragment.kt | 109 +++++++++++++++++++++++-------------------------------
1 files changed, 47 insertions(+), 62 deletions(-)
diff --git a/app/src/main/java/com/dollearn/student/ui/home/MatchFragment.kt b/app/src/main/java/com/dollearn/student/ui/home/MatchFragment.kt
index 280bf8a..de291b6 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/MatchFragment.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/MatchFragment.kt
@@ -17,42 +17,7 @@
import com.dollearn.student.utils.Const
import com.dollearn.student.utils.event.EmptyEvent
import com.dollearn.student.utils.extention.clickDelay
-import kotlinx.android.synthetic.main.fragment_choose_voice.*
import kotlinx.android.synthetic.main.fragment_match.*
-import kotlinx.android.synthetic.main.fragment_match.cl_1
-import kotlinx.android.synthetic.main.fragment_match.cl_2
-import kotlinx.android.synthetic.main.fragment_match.cl_3
-import kotlinx.android.synthetic.main.fragment_match.cl_4
-import kotlinx.android.synthetic.main.fragment_match.cl_voice_end_1
-import kotlinx.android.synthetic.main.fragment_match.cl_voice_end_2
-import kotlinx.android.synthetic.main.fragment_match.cl_voice_end_3
-import kotlinx.android.synthetic.main.fragment_match.cl_voice_end_4
-import kotlinx.android.synthetic.main.fragment_match.iv1_1
-import kotlinx.android.synthetic.main.fragment_match.iv1_1_end
-import kotlinx.android.synthetic.main.fragment_match.iv1_2
-import kotlinx.android.synthetic.main.fragment_match.iv1_2_end
-import kotlinx.android.synthetic.main.fragment_match.iv1_3
-import kotlinx.android.synthetic.main.fragment_match.iv1_3_end
-import kotlinx.android.synthetic.main.fragment_match.iv1_4_end
-import kotlinx.android.synthetic.main.fragment_match.iv2_1
-import kotlinx.android.synthetic.main.fragment_match.iv2_1_end
-import kotlinx.android.synthetic.main.fragment_match.iv2_2
-import kotlinx.android.synthetic.main.fragment_match.iv2_2_end
-import kotlinx.android.synthetic.main.fragment_match.iv2_3
-import kotlinx.android.synthetic.main.fragment_match.iv2_3_end
-import kotlinx.android.synthetic.main.fragment_match.iv2_4_end
-import kotlinx.android.synthetic.main.fragment_match.iv_1
-import kotlinx.android.synthetic.main.fragment_match.iv_2
-import kotlinx.android.synthetic.main.fragment_match.iv_3
-import kotlinx.android.synthetic.main.fragment_match.iv_4
-import kotlinx.android.synthetic.main.fragment_match.iv_playing_1
-import kotlinx.android.synthetic.main.fragment_match.iv_playing_1_end
-import kotlinx.android.synthetic.main.fragment_match.iv_playing_2
-import kotlinx.android.synthetic.main.fragment_match.iv_playing_2_end
-import kotlinx.android.synthetic.main.fragment_match.iv_playing_3
-import kotlinx.android.synthetic.main.fragment_match.iv_playing_3_end
-import kotlinx.android.synthetic.main.fragment_match.iv_playing_4_end
-import kotlinx.android.synthetic.main.fragment_match.motion
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.jetbrains.anko.imageResource
@@ -150,7 +115,6 @@
if (!playing){
voiceIndex = index
handler?.sendEmptyMessage(PLAY_VOICE)
- motion.transitionToEnd()
}
}
}
@@ -516,10 +480,10 @@
@Subscribe
fun onEvent(e: EmptyEvent){
if (e.code == Const.EventCode.RECOVERD){
-// if (act.fragments[act.vp.currentItem] == this){ //自动播放
-// isAutoPlaying = true
-// cl_voice_1.callOnClick()
-// }
+ if (act.fragments[act.vp.currentItem] == this){ //自动播放
+ isAutoPlaying = true
+ cl_voice_1.callOnClick()
+ }
}
}
@@ -544,8 +508,8 @@
cl_voice_end_3.gone()
cl_voice_end_4.gone()
if (act.fragments[act.vp.currentItem] == this&&act.recoverd) { //自动播放
-// isAutoPlaying = true
-// cl_voice_1.callOnClick()
+ isAutoPlaying = true
+ cl_voice_1.callOnClick()
}
}
@@ -629,37 +593,24 @@
iv1_1.visible()
iv2_1.visible()
iv_playing_1.gone()
- if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
- voiceIndex = -1
- nowVoiceView = null
- }
+
}
1->{
iv1_2.visible()
iv2_2.visible()
iv_playing_2.gone()
- if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
- voiceIndex = -1
- nowVoiceView = null
- }
+
}
2->{
iv1_3.visible()
iv2_3.visible()
iv_playing_3.gone()
- if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
- voiceIndex = -1
- nowVoiceView = null
- }
+
}
3->{
iv1_4.visible()
iv2_4.visible()
iv_playing_4.gone()
- if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
- voiceIndex = -1
- nowVoiceView = null
- }
}
4->{
@@ -687,16 +638,50 @@
voiceIndex = -1
}
}
- if (data!!.subjectList[group].filter { it.completed }.size == 4){ //全部答对
- handler?.sendEmptyMessage(TO_NEXT)
- }
if (errorPlaying)
errorPlaying = false
if (rightPlaying){
rightPlaying = false
- nowVoiceView?.callOnClick()
+// nowVoiceView?.callOnClick() //客户需求：回答正确后不再重播语音 直接下一题
data!!.subjectList[group][imgPosition].completed = true
+
+ when(voiceIndex){
+ 0->{
+ if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
+ voiceIndex = -1
+ nowVoiceView = null
+ isAutoPlaying = true
+ cl_voice_2.callOnClick()
+ }
+ }
+ 1->{
+ if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
+ voiceIndex = -1
+ nowVoiceView = null
+ isAutoPlaying = true
+ cl_voice_3.callOnClick()
+ }
+ }
+ 2->{
+ if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
+ voiceIndex = -1
+ nowVoiceView = null
+ isAutoPlaying = true
+ cl_voice_4.callOnClick()
+ }
+ }
+ 3->{
+ if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
+ voiceIndex = -1
+ nowVoiceView = null
+ }
+ }
+ }
+ if (data!!.subjectList[group].filter { it.completed }.size == 4){ //全部答对
+ handler?.sendEmptyMessage(TO_NEXT)
+ }
+
}
}
--
Gitblit v1.7.1