save

lmw

昨天 9904e5f900ba751c1fe719cdf889f00e9f1418e8

 app/src/main/java/com/dollearn/student/ui/home/IncludeFragment.kt

@@ -56,6 +56,10 @@

    private var nowVoiceView: View? = null

    private var isAutoPlaying = false //true自动播放流程

    var right = true //true进入下一题为全对，false 一旦答错过就置为false，此时进入下一题，本题算做错误

    override fun onFirstVisibleToUser() {
        player.setOnAudioStatusUpdateListener(this)
        player.stopPlayMusic()
@@ -95,13 +99,13 @@
                iv_1.setImageURI(originList[0].img)
                iv_2.setImageURI(originList[1].img)
                iv_4.setImageURI(originList[3].img)
                if (cl_1.width > dip(203)){
                    voiceViews.forEach {
                        it.layoutParams.width = dip(159)
                        it.layoutParams.height = dip(52)
                        it.requestLayout()
                    }
                }
//                if (cl_1.width > dip(203)){
//                    voiceViews.forEach {
//                        it.layoutParams.width = dip(159)
//                        it.layoutParams.height = dip(52)
//                        it.requestLayout()
//                    }
//                }
                voiceViews.forEach { it.visible() }
            },500)
        }
@@ -115,8 +119,10 @@
                    constraintLayout.isEnabled = data!!.subjectList[group][index].listend
            }
        }
        showVoiceEnable()
        initClick()
        showVoiceEnable()
        isAutoPlaying = true
        voiceViews[0].callOnClick()
    }

    private fun initClick() {
@@ -149,6 +155,7 @@
                motion.transitionToEnd()
                showResultAnim()
            }else{
                right = false
                handler?.sendEmptyMessage(PLAY_ERROR)
                iv_error_1.visible()
                iv_error_1.postDelayed({
@@ -174,6 +181,7 @@
                motion.transitionToEnd()
                showResultAnim()
            }else{
                right = false
                handler?.sendEmptyMessage(PLAY_ERROR)
                iv_error_2.visible()
                iv_error_2.postDelayed({
@@ -199,6 +207,7 @@
                motion.transitionToEnd()
                showResultAnim()
            }else{
                right = false
                handler?.sendEmptyMessage(PLAY_ERROR)
                iv_error_3.visible()
                iv_error_3.postDelayed({
@@ -363,6 +372,8 @@
     */
    fun recover(){
        Log.e(TAG,"回到上一题，恢复答题前的状态")
        right = true
        isAutoPlaying = false
        motion.progress = 0f
        clearAnswerImg()
        currentImage = 0
@@ -482,7 +493,7 @@
                }else{
                    hideAnswerImg()
                    Log.e(TAG,"本题全部答对，3秒后进入下一图")
                    handler?.sendEmptyMessageDelayed(TO_NEXT,3000)
                    handler?.sendEmptyMessageDelayed(TO_NEXT,500) //万俊杰：缩短为0.5秒
                }
            }
        }
@@ -492,8 +503,27 @@
            rightPlaying = false
            data!!.subjectList[group][currentImage].completed = true
            nowVoiceView?.callOnClick()
        }else
        }else{
            subject.listend = true
            if (isAutoPlaying)
                when(voiceIndex){
                    0-> voiceViews[1].callOnClick()
                    1-> voiceViews[2].callOnClick()
                    3-> voiceViews[4].callOnClick()
                    2,4,5-> isAutoPlaying = false
                }
            else if (subject.completed){
                when(voiceIndex){
                    2->{
                        isAutoPlaying = true
                        voiceViews[3].callOnClick()
                    }
                    4->{
                        voiceViews[5].callOnClick()
                    }
                }
            }
        }
        showVoiceEnable()
    }